X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchbar.cpp;h=ba514a62631f7f65372f66c81b40c4a9370fb051;hp=3ebf67c9f26855829333d21deb4088cc4a439b25;hb=e38846f054ad1766f2e91992a57bbaffd33c7c06;hpb=fcacaaf16551524c7ebb6114254d005274cc3d63 diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp index 3ebf67c9..ba514a62 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-2019 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, &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());