feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Use Qt5-style connects

Browse Source 
The heavy lifting was done by clazy.

Change-Id: Ied9c7fcc031e530c41b342de950e2f0ac730bbb1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-06-28 23:07:19 +03:00
committed by Orgad Shaneh
parent 700239c681
commit d01adc134d
32 changed files with 159 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/help/searchwidget.cpp
View File

@@ -131,24 +131,24 @@ void SearchWidget::showEvent(QShowEvent *event)
setFocusProxy(queryWidget);
connect(queryWidget, SIGNAL(search()), this, SLOT(search()));
connect(queryWidget, &QHelpSearchQueryWidget::search, this, &SearchWidget::search);
connect(resultWidget, &QHelpSearchResultWidget::requestShowLink, this,
[this](const QUrl &url) {
emit linkActivated(url, currentSearchTerms(), false/*newPage*/);
});
connect(searchEngine, SIGNAL(searchingStarted()), this,
SLOT(searchingStarted()));
connect(searchEngine, SIGNAL(searchingFinished(int)), this,
SLOT(searchingFinished(int)));
connect(searchEngine, &QHelpSearchEngine::searchingStarted, this,
&SearchWidget::searchingStarted);
connect(searchEngine, &QHelpSearchEngine::searchingFinished, this,
&SearchWidget::searchingFinished);
QTextBrowser* browser = resultWidget->findChild<QTextBrowser*>();
browser->viewport()->installEventFilter(this);
connect(searchEngine, SIGNAL(indexingStarted()), this,
SLOT(indexingStarted()));
connect(searchEngine, SIGNAL(indexingFinished()), this,
SLOT(indexingFinished()));
connect(searchEngine, &QHelpSearchEngine::indexingStarted, this,
&SearchWidget::indexingStarted);
connect(searchEngine, &QHelpSearchEngine::indexingFinished, this,
&SearchWidget::indexingFinished);
QMetaObject::invokeMethod(&LocalHelpManager::helpEngine(), "setupFinished",
Qt::QueuedConnection);
@@ -207,7 +207,8 @@ void SearchWidget::indexingStarted()
m_progress->reportStarted();
m_watcher.setFuture(m_progress->future());
connect(&m_watcher, SIGNAL(canceled()), searchEngine, SLOT(cancelIndexing()));
connect(&m_watcher, &QFutureWatcherBase::canceled,
searchEngine, &QHelpSearchEngine::cancelIndexing);
}
void SearchWidget::indexingFinished()
@@ -259,9 +260,9 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
openLinkInNewTab = menu.addAction(tr("Open Link as New Page"));
copyAnchorAction = menu.addAction(tr("Copy Link"));
} else if (browser->textCursor().hasSelection()) {
menu.addAction(tr("Copy"), browser, SLOT(copy()));
connect(menu.addAction(tr("Copy")), &QAction::triggered, browser, &QTextEdit::copy);
} else {
menu.addAction(tr("Reload"), browser, SLOT(reload()));
connect(menu.addAction(tr("Reload")), &QAction::triggered, browser, &QTextBrowser::reload);
}
QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos()));
@@ -301,8 +302,8 @@ SearchSideBarItem::SearchSideBarItem()
: SideBarItem(new SearchWidget, QLatin1String(Constants::HELP_SEARCH))
{
widget()->setWindowTitle(HelpPlugin::tr(Constants::SB_SEARCH));
connect(widget(), SIGNAL(linkActivated(QUrl,QStringList,bool)),
this, SIGNAL(linkActivated(QUrl,QStringList,bool)));
connect(static_cast<SearchWidget *>(widget()), &SearchWidget::linkActivated,
this, &SearchSideBarItem::linkActivated);
}
QList<QToolButton *> SearchSideBarItem::createToolBarWidgets()
@@ -310,7 +311,7 @@ QList<QToolButton *> SearchSideBarItem::createToolBarWidgets()
QToolButton *reindexButton = new QToolButton;
reindexButton->setIcon(Core::Icons::RELOAD.icon());
reindexButton->setToolTip(tr("Regenerate Index"));
connect(reindexButton, SIGNAL(clicked()),
widget(), SLOT(reindexDocumentation()));
connect(reindexButton, &QAbstractButton::clicked,
static_cast<SearchWidget *>(widget()), &SearchWidget::reindexDocumentation);
return QList<QToolButton *>() << reindexButton;
}