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

[dolphin.git] / src / filterbar / filterbar.cpp

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 8e4dfcc9bc38c455dd5447e210b0b712e2fe1a67..7a8951743bc4a5d8c8274dd410de9cc1d1e0e9ef 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -24,10 +24,10 @@
 #include <QLabel>
 #include <QToolButton>
 
-#include <kicon.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kiconloader.h>
+#include <KIcon>
+#include <KLocale>
+#include <KLineEdit>
+#include <KIconLoader>
 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
@@ -46,8 +46,8 @@ FilterBar::FilterBar(QWidget* parent) :
     m_filterInput = new KLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
     m_filterInput->setClearButtonShown(true);
-    connect(m_filterInput, SIGNAL(textChanged(const QString&)),
-            this, SIGNAL(filterChanged(const QString&)));
+    connect(m_filterInput, SIGNAL(textChanged(QString)),
+            this, SIGNAL(filterChanged(QString)));
     setFocusProxy(m_filterInput);
 
     // Apply layout
@@ -84,12 +84,23 @@ void FilterBar::showEvent(QShowEvent* event)
 void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
-    if ((event->key() == Qt::Key_Escape)) {
+
+    switch (event->key()) {
+    case Qt::Key_Escape:
         if (m_filterInput->text().isEmpty()) {
             emit closeRequest();
         } else {
             m_filterInput->clear();
         }
+        break;
+
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+        emit focusViewRequest();
+        break;
+
+    default:
+        break;
     }
 }