diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-12-13 01:18:33 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2015-12-18 11:54:12 +0000 |
commit | 9d3b2f09986ef23afc9907c60acc9331697225ea (patch) | |
tree | f0baefe87dab138a59dd5b93bba45283e32069d4 /src/plugins/texteditor/basefilefind.cpp | |
parent | b6131e1b1dfc471e869d650ff97a6b119ec2325c (diff) |
TextEditor: Use Qt5-style connects
The heavy lifting was done by clazy.
Change-Id: I380120e3419d2a3c0e272f51cc3e0d5f6aaa5e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/basefilefind.cpp')
-rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index ff6b4e3d6b..3f4b46b508 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -147,17 +147,15 @@ void BaseFileFind::runNewSearch(const QString &txt, FindFlags findFlags, parameters.nameFilters = fileNameFilters(); parameters.additionalParameters = additionalParameters(); search->setUserData(qVariantFromValue(parameters)); - connect(search, SIGNAL(activated(Core::SearchResultItem)), this, SLOT(openEditor(Core::SearchResultItem))); - if (searchMode == SearchResultWindow::SearchAndReplace) { - connect(search, SIGNAL(replaceButtonClicked(QString,QList<Core::SearchResultItem>,bool)), - this, SLOT(doReplace(QString,QList<Core::SearchResultItem>,bool))); - } - connect(search, SIGNAL(visibilityChanged(bool)), this, SLOT(hideHighlightAll(bool))); - connect(search, SIGNAL(cancelled()), this, SLOT(cancel())); - connect(search, SIGNAL(paused(bool)), this, SLOT(setPaused(bool))); - connect(search, SIGNAL(searchAgainRequested()), this, SLOT(searchAgain())); - connect(this, SIGNAL(enabledChanged(bool)), search, SIGNAL(requestEnabledCheck())); - connect(search, SIGNAL(requestEnabledCheck()), this, SLOT(recheckEnabled())); + connect(search, &SearchResult::activated, this, &BaseFileFind::openEditor); + if (searchMode == SearchResultWindow::SearchAndReplace) + connect(search, &SearchResult::replaceButtonClicked, this, &BaseFileFind::doReplace); + connect(search, &SearchResult::visibilityChanged, this, &BaseFileFind::hideHighlightAll); + connect(search, &SearchResult::cancelled, this, &BaseFileFind::cancel); + connect(search, &SearchResult::paused, this, &BaseFileFind::setPaused); + connect(search, &SearchResult::searchAgainRequested, this, &BaseFileFind::searchAgain); + connect(this, &BaseFileFind::enabledChanged, search, &SearchResult::requestEnabledCheck); + connect(search, &SearchResult::requestEnabledCheck, this, &BaseFileFind::recheckEnabled); runSearch(search); } @@ -166,15 +164,15 @@ void BaseFileFind::runSearch(SearchResult *search) { FileFindParameters parameters = search->userData().value<FileFindParameters>(); CountingLabel *label = new CountingLabel; - connect(search, SIGNAL(countChanged(int)), label, SLOT(updateCount(int))); + connect(search, &SearchResult::countChanged, label, &CountingLabel::updateCount); CountingLabel *statusLabel = new CountingLabel; - connect(search, SIGNAL(countChanged(int)), statusLabel, SLOT(updateCount(int))); + connect(search, &SearchResult::countChanged, statusLabel, &CountingLabel::updateCount); SearchResultWindow::instance()->popup(IOutputPane::Flags(IOutputPane::ModeSwitch|IOutputPane::WithFocus)); QFutureWatcher<FileSearchResultList> *watcher = new QFutureWatcher<FileSearchResultList>(); d->m_watchers.insert(watcher, search); watcher->setPendingResultsLimit(1); - connect(watcher, SIGNAL(resultReadyAt(int)), this, SLOT(displayResult(int))); - connect(watcher, SIGNAL(finished()), this, SLOT(searchFinished())); + connect(watcher, &QFutureWatcherBase::resultReadyAt, this, &BaseFileFind::displayResult); + connect(watcher, &QFutureWatcherBase::finished, this, &BaseFileFind::searchFinished); if (parameters.flags & FindRegularExpression) { watcher->setFuture(Utils::findInFilesRegExp(parameters.text, files(parameters.nameFilters, parameters.additionalParameters), @@ -190,7 +188,7 @@ void BaseFileFind::runSearch(SearchResult *search) ProgressManager::addTask(watcher->future(), tr("Searching"), Constants::TASK_SEARCH); progress->setWidget(label); progress->setStatusBarWidget(statusLabel); - connect(progress, SIGNAL(clicked()), search, SLOT(popup())); + connect(progress, &FutureProgress::clicked, search, &SearchResult::popup); } void BaseFileFind::findAll(const QString &txt, FindFlags findFlags) |