summaryrefslogtreecommitdiffstats
path: root/src/assistant/assistant/centralwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/assistant/assistant/centralwidget.cpp')
-rw-r--r--src/assistant/assistant/centralwidget.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index 34304f737..bac8f6fc8 100644
--- a/src/assistant/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -545,10 +545,10 @@ void CentralWidget::highlightSearchTerms()
const bool wholePhrase = searchInput.startsWith(QLatin1Char('"')) &&
searchInput.endsWith(QLatin1Char('"'));
const QStringList &words = wholePhrase ? QStringList(searchInput.mid(1, searchInput.length() - 2)) :
- searchInput.split(QRegExp("\\W+"), QString::SkipEmptyParts);
+ searchInput.split(QRegExp("\\W+"), Qt::SkipEmptyParts);
HelpViewer *viewer = currentHelpViewer();
for (const QString &word : words)
- viewer->findText(word, nullptr, false, true);
+ viewer->findText(word, {}, false, true);
disconnect(viewer, &HelpViewer::loadFinished,
this, &CentralWidget::highlightSearchTerms);
}
@@ -568,12 +568,12 @@ void CentralWidget::handleSourceChanged(const QUrl &url)
emit sourceChanged(url);
}
-void CentralWidget::slotHighlighted(const QString &link)
+void CentralWidget::slotHighlighted(const QUrl &link)
{
TRACE_OBJ
- QString resolvedLink = m_resolvedLinks.value(link);
+ QUrl resolvedLink = m_resolvedLinks.value(link);
if (!link.isEmpty() && resolvedLink.isEmpty()) {
- resolvedLink = HelpEngineWrapper::instance().findFile(link).toString();
+ resolvedLink = HelpEngineWrapper::instance().findFile(link);
m_resolvedLinks.insert(link, resolvedLink);
}
emit highlighted(resolvedLink);
@@ -605,7 +605,7 @@ void CentralWidget::connectSignals(HelpViewer *page)
this, &CentralWidget::backwardAvailable);
connect(page, &HelpViewer::sourceChanged,
this, &CentralWidget::handleSourceChanged);
- connect(page, QOverload<const QString &>::of(&HelpViewer::highlighted),
+ connect(page, QOverload<const QUrl &>::of(&HelpViewer::highlighted),
this, &CentralWidget::slotHighlighted);
}