X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a05db2f0d081a67f306141e2f31442eea49dd71b..502a5c86feb0015c42f052d242c8115de320a38e:/src/filterbar/filterbar.cpp

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 3fa9cc147..813a50838 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -18,44 +18,44 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
+
 #include "filterbar.h"
 
-#include <QBoxLayout>
+#include <KLocalizedString>
+
+#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
+#include <QLineEdit>
 #include <QToolButton>
 
-#include <KIcon>
-#include <KLocale>
-#include <KLineEdit>
-#include <KIconLoader>
-
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
 {
     // Create close button
     QToolButton *closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
-    closeButton->setIcon(KIcon("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
-    connect(closeButton, SIGNAL(clicked()), this, SIGNAL(closeRequest()));
+    connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
 
     // Create button to lock text when changing folders
     m_lockButton = new QToolButton(this);
+    m_lockButton->setAutoRaise(true);
     m_lockButton->setCheckable(true);
-    m_lockButton->setIcon(KIcon("system-lock-screen.png"));
+    m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
     m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders"));
-    connect(m_lockButton, SIGNAL(toggled(bool)), this, SLOT(slotToggleLockButton(bool)));
+    connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
     // Create label
     QLabel* filterLabel = new QLabel(i18nc("@label:textbox", "Filter:"), this);
 
     // Create filter editor
-    m_filterInput = new KLineEdit(this);
+    m_filterInput = new QLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
-    m_filterInput->setClearButtonShown(true);
-    connect(m_filterInput, SIGNAL(textChanged(QString)),
-            this, SIGNAL(filterChanged(QString)));
+    m_filterInput->setClearButtonEnabled(true);
+    connect(m_filterInput, &QLineEdit::textChanged,
+            this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
     // Apply layout
@@ -101,7 +101,10 @@ void FilterBar::slotUrlChanged()
 
 void FilterBar::slotToggleLockButton(bool checked)
 {
-    if (!checked) {
+    if (checked) {
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
+    } else {
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
         clear();
     }
 }
@@ -136,4 +139,3 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
     }
 }
 
-#include "filterbar.moc"