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

2 files changed, 4 insertions, 19 deletions

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 9f3b53c05..9f20afea2 100644
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -25,7 +25,6 @@
 
 KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
     KTextEdit(parent),
-    m_index(0),
     m_role(),
     m_blockFinishedSignal(false)
 {
@@ -46,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;
@@ -95,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, KIO::encodeFileName(toPlainText()));
+        emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));
         m_blockFinishedSignal = false;
         event->accept();
         return;
@@ -139,7 +128,7 @@ void KItemListRoleEditor::autoAdjustSize()
 void KItemListRoleEditor::emitRoleEditingFinished()
 {
     if (!m_blockFinishedSignal) {
-        emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText()));
+        emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText()));
     }
 }
 
diff --git a/src/kitemviews/private/kitemlistroleeditor.h b/src/kitemviews/private/kitemlistroleeditor.h
index aa2c97754..7c2b61e2d 100644
--- a/src/kitemviews/private/kitemlistroleeditor.h
+++ b/src/kitemviews/private/kitemlistroleeditor.h
@@ -41,17 +41,14 @@ public:
     explicit KItemListRoleEditor(QWidget* parent);
     virtual ~KItemListRoleEditor();
 
-    void setIndex(int index);
-    int index() const;
-
     void setRole(const QByteArray& role);
     QByteArray role() const;
 
     virtual bool eventFilter(QObject* watched, QEvent* event);
 
 signals:
-    void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
-    void roleEditingCanceled(int index, const QByteArray& role, const QVariant& value);
+    void roleEditingFinished(const QByteArray& role, const QVariant& value);
+    void roleEditingCanceled(const QByteArray& role, const QVariant& value);
 
 protected:
     virtual bool event(QEvent* event);
@@ -72,7 +69,6 @@ private:
     void emitRoleEditingFinished();
 
 private:
-    int m_index;
     QByteArray m_role;
     bool m_blockFinishedSignal;
 };