X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchbar.cpp;h=a992b434422a08c2e24938803dee8d86c09e3adb;hp=a8d468064734291dacca4cfa1e1bbef77c327bf7;hb=4e51500401db3c85dbe5e92e5e5c15b6e3c87787;hpb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp index a8d46806..a992b434 100644 --- a/src/qtui/chatviewsearchbar.cpp +++ b/src/qtui/chatviewsearchbar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -25,7 +25,7 @@ #include "icon.h" #include "qtui.h" -ChatViewSearchBar::ChatViewSearchBar(QWidget *parent) +ChatViewSearchBar::ChatViewSearchBar(QWidget* parent) : QWidget(parent) { ui.setupUi(this); @@ -38,21 +38,21 @@ ChatViewSearchBar::ChatViewSearchBar(QWidget *parent) 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); - auto *hideSearchBar = coll->add("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());