X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchbar.cpp;h=ba514a62631f7f65372f66c81b40c4a9370fb051;hp=7113ab5d301ce96de7ec84e8aaac0cf110791fb7;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=7de4debb5a6744d9f67cb09c5fc0aa136f05be96

diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp
index 7113ab5d..ba514a62 100644
--- a/src/qtui/chatviewsearchbar.cpp
+++ b/src/qtui/chatviewsearchbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,37 +22,37 @@
 
 #include "action.h"
 #include "actioncollection.h"
-#include "iconloader.h"
+#include "icon.h"
 #include "qtui.h"
 
-ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
+ChatViewSearchBar::ChatViewSearchBar(QWidget* parent)
     : QWidget(parent)
 {
     ui.setupUi(this);
-    ui.hideButton->setIcon(QIcon::fromTheme("dialog-close"));
-    ui.searchUpButton->setIcon(QIcon::fromTheme("go-up"));
-    ui.searchDownButton->setIcon(QIcon::fromTheme("go-down"));
+    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);
 
     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);
+    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
@@ -66,13 +66,11 @@ void ChatViewSearchBar::setVisible(bool visible)
         emit hidden();
 }
 
-
 void ChatViewSearchBar::delaySearch()
 {
     _searchDelayTimer.start(300);
 }
 
-
 void ChatViewSearchBar::search()
 {
     emit searchChanged(ui.searchEditLine->text());