Merge remote-tracking branch 'origin/KDE/4.10'

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

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 1e4b5fd4e0988c7ce38160124c5d9392cb94f65b..9f20afea24e81d2b89d3ed37baa067181721b16f 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -20,17 +20,18 @@
 #include "kitemlistroleeditor.h"
 
 #include <KDebug>
+#include <kio/global.h>
 #include <QKeyEvent>
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
-    m_index(0),
     m_role(),
     m_blockFinishedSignal(false)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setAcceptRichText(false);
+    enableFindReplace(false);
     document()->setDocumentMargin(0);
 
     if (parent) {
@@ -44,16 +45,6 @@ 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;
@@ -93,7 +84,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
         // a roleEditingFinished signal (see KItemListRoleEditor::event),
         // which is not wanted in this case.
         m_blockFinishedSignal = true;
-        emit roleEditingCanceled(m_index, m_role, toPlainText());
+        emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));
         m_blockFinishedSignal = false;
         event->accept();
         return;
@@ -137,7 +128,7 @@ void KItemListRoleEditor::autoAdjustSize()
 void KItemListRoleEditor::emitRoleEditingFinished()
 {
     if (!m_blockFinishedSignal) {
-        emit roleEditingFinished(m_index, m_role, toPlainText());
+        emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText()));
     }
 }