X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchbar.cpp;h=d7e0cfc3a526003dbdf0143b33af330fb9316ff9;hp=19fce8a6f3b16343c7d8409a3cdcf1cc29632dd9;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=33d1a8a2d620c37a67d85c6948d9d1926baedfbb

diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp
index 19fce8a6..d7e0cfc3 100644
--- a/src/qtui/chatviewsearchbar.cpp
+++ b/src/qtui/chatviewsearchbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,56 +15,66 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "chatviewsearchbar.h"
 
 #include "action.h"
 #include "actioncollection.h"
-#include "iconloader.h"
+#include "icon.h"
 #include "qtui.h"
 
 ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
-  : QWidget(parent)
+    : QWidget(parent)
 {
-  ui.setupUi(this);
-  ui.hideButton->setIcon(BarIcon("dialog-close"));
-  ui.searchUpButton->setIcon(SmallIcon("go-up"));
-  ui.searchDownButton->setIcon(SmallIcon("go-down"));
-  _searchDelayTimer.setSingleShot(true);
+    ui.setupUi(this);
+    ui.hideButton->setIcon(icon::get("dialog-close"));
+    ui.searchUpButton->setIcon(icon::get("go-up"));
+    ui.searchDownButton->setIcon(icon::get("go-down"));
+    _searchDelayTimer.setSingleShot(true);
 
-  layout()->setContentsMargins(0, 0, 0, 0);
+    layout()->setContentsMargins(0, 0, 0, 0);
 
-  hide();
+    hide();
 
-  ActionCollection *coll = QtUi::actionCollection("General");
+    ActionCollection *coll = QtUi::actionCollection("General");
 
-  QAction *toggleSearchBar = coll->action("ToggleSearchBar");
-  connect(toggleSearchBar, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
+    QAction *toggleSearchBar = coll->action("ToggleSearchBar");
+    connect(toggleSearchBar, &QAction::toggled, this, &QWidget::setVisible);
 
-  Action *hideSearchBar = coll->add<Action>("HideSearchBar", toggleSearchBar, SLOT(setChecked(bool)));
-  hideSearchBar->setShortcutConfigurable(false);
-  hideSearchBar->setShortcut(Qt::Key_Escape);
+    auto *hideSearchBar = new Action{{}, this, toggleSearchBar, &QAction::setChecked};
+    hideSearchBar->setShortcut(Qt::Key_Escape);
+    hideSearchBar->setShortcutConfigurable(false);
+    coll->addAction("HideSearchBar", hideSearchBar);
 
-  connect(ui.hideButton, SIGNAL(clicked()), toggleSearchBar, SLOT(toggle()));
-  connect(ui.searchEditLine, SIGNAL(textChanged(const QString &)), this, SLOT(delaySearch()));
-  connect(&_searchDelayTimer, SIGNAL(timeout()), this, SLOT(search()));
+    connect(ui.hideButton, &QAbstractButton::clicked, toggleSearchBar, &QAction::toggle);
+    connect(ui.searchEditLine, &QLineEdit::textChanged, this, &ChatViewSearchBar::delaySearch);
+    connect(&_searchDelayTimer, &QTimer::timeout, this, &ChatViewSearchBar::search);
 }
 
-void ChatViewSearchBar::setVisible(bool visible) {
-  // clearing the search field also removes the highlight items from the scene
-  // this should be done before the SearchBar is hidden, as the hiding triggers
-  // a resize event which can lead to strange side effects.
-  ui.searchEditLine->clear();
-  QWidget::setVisible(visible);
-  if(visible) ui.searchEditLine->setFocus();
+
+void ChatViewSearchBar::setVisible(bool visible)
+{
+    // clearing the search field also removes the highlight items from the scene
+    // this should be done before the SearchBar is hidden, as the hiding triggers
+    // a resize event which can lead to strange side effects.
+    ui.searchEditLine->clear();
+    QWidget::setVisible(visible);
+    if (visible)
+        ui.searchEditLine->setFocus();
+    else
+        emit hidden();
 }
 
-void ChatViewSearchBar::delaySearch() {
-  _searchDelayTimer.start(300);
+
+void ChatViewSearchBar::delaySearch()
+{
+    _searchDelayTimer.start(300);
 }
 
-void ChatViewSearchBar::search() {
-  emit searchChanged(ui.searchEditLine->text());
+
+void ChatViewSearchBar::search()
+{
+    emit searchChanged(ui.searchEditLine->text());
 }