X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fclearablelineedit.cpp;h=e0a82c9045ab3759e01b5b94c6d0537cd8df1548;hb=2c8434f74c68194d56f2084f637419123e61d18b;hp=11d6239aa651bb2baddd336d988674056b79ca52;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49;p=quassel.git

diff --git a/src/uisupport/clearablelineedit.cpp b/src/uisupport/clearablelineedit.cpp
index 11d6239a..e0a82c90 100644
--- a/src/uisupport/clearablelineedit.cpp
+++ b/src/uisupport/clearablelineedit.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,21 +23,19 @@
 #include <QToolButton>
 #include <QStyle>
 
-#include "iconloader.h"
+#include "icon.h"
 
 ClearableLineEdit::ClearableLineEdit(QWidget *parent)
     : QLineEdit(parent)
 {
     clearButton = new QToolButton(this);
-    clearButton->setIcon(SmallIcon("edit-clear-locationbar-rtl"));
-#ifndef Q_WS_QWS
+    clearButton->setIcon(icon::get("edit-clear-locationbar-rtl"));
     clearButton->setCursor(Qt::ArrowCursor);
-#endif
     clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
     clearButton->hide();
 
-    connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
-    connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(updateClearButton(const QString &)));
+    connect(clearButton, &QAbstractButton::clicked, this, &QLineEdit::clear);
+    connect(this, &QLineEdit::textChanged, this, &ClearableLineEdit::updateClearButton);
 
     int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
     setStyleSheet(QString("QLineEdit { padding-right: %1px; } ").arg(clearButton->sizeHint().width() + frameWidth + 1));