Merge branch 'Applications/18.08'

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

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index b850469bf0ccd8295601a9df8fa7c29506069e48..813a50838bed208a8a364a34ca90cad915e14a44 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -18,16 +18,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
+
 #include "filterbar.h"
 
+#include <KLocalizedString>
+
+#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
+#include <QLineEdit>
 #include <QToolButton>
-#include <QHBoxLayout>
-
-#include <QIcon>
-#include <KLocale>
-#include <KLineEdit>
 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
@@ -35,7 +35,7 @@ FilterBar::FilterBar(QWidget* parent) :
     // Create close button
     QToolButton *closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
-    closeButton->setIcon(QIcon::fromTheme("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
     closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
     connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
 
@@ -43,7 +43,7 @@ FilterBar::FilterBar(QWidget* parent) :
     m_lockButton = new QToolButton(this);
     m_lockButton->setAutoRaise(true);
     m_lockButton->setCheckable(true);
-    m_lockButton->setIcon(QIcon::fromTheme("object-unlocked"));
+    m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
     m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders"));
     connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
@@ -51,10 +51,10 @@ FilterBar::FilterBar(QWidget* parent) :
     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, &KLineEdit::textChanged,
+    m_filterInput->setClearButtonEnabled(true);
+    connect(m_filterInput, &QLineEdit::textChanged,
             this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
@@ -102,9 +102,9 @@ void FilterBar::slotUrlChanged()
 void FilterBar::slotToggleLockButton(bool checked)
 {
     if (checked) {
-        m_lockButton->setIcon(QIcon::fromTheme("object-locked"));
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
     } else {
-        m_lockButton->setIcon(QIcon::fromTheme("object-unlocked"));
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
         clear();
     }
 }