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

HelpWidget: Avoid using sender()

Browse Source 
Change-Id: Ic4c44b5d3545e55c3bdc11765ff2dd5ac4a5f556
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-19 18:47:58 +02:00
parent 1fade11be2
commit 64f8d2daf3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/helpwidget.cpp
View File

@@ -736,7 +736,9 @@ HelpViewer *HelpWidget::insertViewer(int index, const QUrl &url)
emit m_model.dataChanged(m_model.index(i, 0), m_model.index(i, 0)); emit m_model.dataChanged(m_model.index(i, 0), m_model.index(i, 0));
}); });
connect(viewer, &HelpViewer::loadFinished, this, &HelpWidget::highlightSearchTerms); connect(viewer, &HelpViewer::loadFinished, this, [this, viewer] {
highlightSearchTerms(viewer);
});
connect(viewer, &HelpViewer::newPageRequested, this, &HelpWidget::openNewPage); connect(viewer, &HelpViewer::newPageRequested, this, &HelpWidget::openNewPage);
connect(viewer, &HelpViewer::externalPageRequested, this, [this](const QUrl &url) { connect(viewer, &HelpViewer::externalPageRequested, this, [this](const QUrl &url) {
emit requestShowHelpUrl(url, Core::HelpManager::ExternalHelpAlways); emit requestShowHelpUrl(url, Core::HelpManager::ExternalHelpAlways);
@@ -1005,13 +1007,11 @@ void HelpWidget::print(HelpViewer *viewer)
viewer->print(m_printer); viewer->print(m_printer);
} }
void HelpWidget::highlightSearchTerms() void HelpWidget::highlightSearchTerms(HelpViewer *viewer)
{ {
if (m_searchTerms.isEmpty()) if (m_searchTerms.isEmpty())
return; return;
auto viewer = qobject_cast<HelpViewer *>(sender()); for (const QString &term : qAsConst(m_searchTerms))
QTC_ASSERT(viewer, return);
foreach (const QString& term, m_searchTerms)
viewer->findText(term, {}, false, true); viewer->findText(term, {}, false, true);
m_searchTerms.clear(); m_searchTerms.clear();
} }

2
src/plugins/help/helpwidget.h
View File

@@ -138,7 +138,7 @@ private:
void scaleDown(); void scaleDown();
void resetScale(); void resetScale();
void print(HelpViewer *viewer); void print(HelpViewer *viewer);
void highlightSearchTerms(); void highlightSearchTerms(HelpViewer *viewer);
void addSideBar(); void addSideBar();
QString sideBarSettingsKey() const; QString sideBarSettingsKey() const;