Removed unused KGlobal includes and use KIO/Job instead of KIO/JobClasses

[dolphin.git] / src / kitemviews / private / kitemlistroleeditor.cpp

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 9f3b53c050026b63ddc650bd67be353cd034089f..5ff013429cb709a25dce3518418c896cce98c2a9 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -19,13 +19,11 @@
 
 #include "kitemlistroleeditor.h"
 
 
 #include "kitemlistroleeditor.h"
 

-#include <KDebug>
-#include <kio/global.h>
+#include <KIO/Global>

 #include <QKeyEvent>
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
 #include <QKeyEvent>
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),

-    m_index(0),

     m_role(),
     m_blockFinishedSignal(false)
 {
     m_role(),
     m_blockFinishedSignal(false)
 {


@@ -39,23 +37,13 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
         parent->installEventFilter(this);
     }
 
         parent->installEventFilter(this);
     }
 

-    connect(this, SIGNAL(textChanged()), this, SLOT(autoAdjustSize()));
+    connect(this, &KItemListRoleEditor::textChanged, this, &KItemListRoleEditor::autoAdjustSize);

 }
 
 KItemListRoleEditor::~KItemListRoleEditor()
 {
 }
 
 }
 
 KItemListRoleEditor::~KItemListRoleEditor()
 {
 }
 

-void KItemListRoleEditor::setIndex(int index)
-{
-    m_index = index;
-}
-
-int KItemListRoleEditor::index() const
-{
-    return m_index;
-}
-

 void KItemListRoleEditor::setRole(const QByteArray& role)
 {
     m_role = role;
 void KItemListRoleEditor::setRole(const QByteArray& role)
 {
     m_role = role;


@@ -95,7 +83,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
         // a roleEditingFinished signal (see KItemListRoleEditor::event),
         // which is not wanted in this case.
         m_blockFinishedSignal = true;
         // a roleEditingFinished signal (see KItemListRoleEditor::event),
         // which is not wanted in this case.
         m_blockFinishedSignal = true;

-        emit roleEditingCanceled(m_index, m_role, KIO::encodeFileName(toPlainText()));
+        emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));

         m_blockFinishedSignal = false;
         event->accept();
         return;
         m_blockFinishedSignal = false;
         event->accept();
         return;


@@ -104,6 +92,22 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
         emitRoleEditingFinished();
         event->accept();
         return;
         emitRoleEditingFinished();
         event->accept();
         return;

+    case Qt::Key_Left:
+    case Qt::Key_Right: {
+        QTextCursor cursor = textCursor();
+        if (event->modifiers() == Qt::NoModifier && cursor.hasSelection()) {
+            if (event->key() == Qt::Key_Left) {
+                cursor.setPosition(cursor.selectionStart());
+            } else {
+                cursor.setPosition(cursor.selectionEnd());
+            }
+            cursor.clearSelection();
+            setTextCursor(cursor);
+            event->accept();
+            return;
+        }
+        break;
+    }

     default:
         break;
     }
     default:
         break;
     }


@@ -139,8 +143,7 @@ void KItemListRoleEditor::autoAdjustSize()
 void KItemListRoleEditor::emitRoleEditingFinished()
 {
     if (!m_blockFinishedSignal) {
 void KItemListRoleEditor::emitRoleEditingFinished()
 {
     if (!m_blockFinishedSignal) {

-        emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText()));
+        emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText()));

     }
 }
 
     }
 }
 

-#include "kitemlistroleeditor.moc"