Renamed some signals for consistency with KItemViews classes

4 files changed, 13 insertions, 10 deletions

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 615cc9c6d..e1277bdd4 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -48,7 +48,8 @@ KItemListController::KItemListController(QObject* parent) :
     m_pressedMousePos(),
     m_oldSelection()
 {
-    connect(m_keyboardManager, SIGNAL(requestItemActivation(QString,bool)), this, SLOT(slotKeyboardActivationRequested(QString,bool)));
+    connect(m_keyboardManager, SIGNAL(changeCurrentItem(QString,bool)),
+            this, SLOT(slotChangeCurrentItem(QString,bool)));
 }
 
 KItemListController::~KItemListController()
@@ -237,7 +238,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
     return true;
 }
 
-void KItemListController::slotKeyboardActivationRequested(const QString& text, bool searchFromNextItem)
+void KItemListController::slotChangeCurrentItem(const QString& text, bool searchFromNextItem)
 {
     if (!m_model) {
         return;
diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index 2e33948aa..4ce5b804b 100644
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -134,7 +134,7 @@ private slots:
      */
     void slotRubberBandChanged();
 
-    void slotKeyboardActivationRequested(const QString& text, bool searchFromNextItem);
+    void slotChangeCurrentItem(const QString& text, bool searchFromNextItem);
 
 private:
     /**
diff --git a/src/kitemviews/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
index 34633d65c..9552a7582 100644
--- a/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
+++ b/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
@@ -48,7 +48,7 @@ void KItemListKeyboardSearchManager::addKeys(const QString& keys)
     const bool searchFromNextItem = m_searchedString.isEmpty();
     if (!keys.isEmpty()) {
         m_searchedString.append(keys);
-        emit requestItemActivation(m_searchedString, searchFromNextItem);
+        emit changeCurrentItem(m_searchedString, searchFromNextItem);
     }
     m_keyboardInputTime.start();
 }
diff --git a/src/kitemviews/kitemlistkeyboardsearchmanager_p.h b/src/kitemviews/kitemlistkeyboardsearchmanager_p.h
index cf41f3bed..3441dd7bc 100644
--- a/src/kitemviews/kitemlistkeyboardsearchmanager_p.h
+++ b/src/kitemviews/kitemlistkeyboardsearchmanager_p.h
@@ -54,14 +54,16 @@ public:
     void addKeys(const QString& keys);
 
 signals:
-
     /**
-     * Is emitted when a text is to be searched.
-     * @param searchFromNextItem if true, start searching
-     * from item next to current item. Otherwise, search from
-     * current item.
+     * Is emitted if the current item should be changed corresponding
+     * to \a text.
+     * @param searchFromNextItem If true start searching from item next to the
+     *                           current item. Otherwise, search from the
+     *                           current item.
      */
-    void requestItemActivation(const QString& string, bool searchFromNextItem);
+    // TODO: Think about getting rid of the bool parameter
+    // (see http://doc.qt.nokia.com/qq/qq13-apis.html#thebooleanparametertrap)
+    void changeCurrentItem(const QString& string, bool searchFromNextItem);
 
 private:
     QString m_searchedString;