diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp index e5db350e99a..68c976fbfa0 100644 --- a/src/plugins/coreplugin/helpmanager.cpp +++ b/src/plugins/coreplugin/helpmanager.cpp @@ -96,15 +96,15 @@ QByteArray fileData(const QUrl &url) return checkInstance() ? m_instance->fileData(url) : QByteArray(); } -void handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocation location) +void showHelpUrl(const QUrl &url, HelpManager::HelpViewerLocation location) { if (checkInstance()) - m_instance->handleHelpRequest(url, location); + m_instance->showHelpUrl(url, location); } -void handleHelpRequest(const QString &url, HelpViewerLocation location) +void showHelpUrl(const QString &url, HelpViewerLocation location) { - handleHelpRequest(QUrl(url), location); + showHelpUrl(QUrl(url), location); } } // HelpManager diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index a97f65b362f..00273365049 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -66,8 +66,8 @@ CORE_EXPORT void unregisterDocumentation(const QStringList &nameSpaces); CORE_EXPORT QMap linksForIdentifier(const QString &id); CORE_EXPORT QByteArray fileData(const QUrl &url); -CORE_EXPORT void handleHelpRequest(const QUrl &url, HelpViewerLocation location = HelpModeAlways); -CORE_EXPORT void handleHelpRequest(const QString &url, HelpViewerLocation location = HelpModeAlways); +CORE_EXPORT void showHelpUrl(const QUrl &url, HelpViewerLocation location = HelpModeAlways); +CORE_EXPORT void showHelpUrl(const QString &url, HelpViewerLocation location = HelpModeAlways); } // HelpManager } // Core diff --git a/src/plugins/coreplugin/helpmanager_implementation.h b/src/plugins/coreplugin/helpmanager_implementation.h index 76e7a1a8078..47afa96f348 100644 --- a/src/plugins/coreplugin/helpmanager_implementation.h +++ b/src/plugins/coreplugin/helpmanager_implementation.h @@ -42,7 +42,7 @@ public: virtual void unregisterDocumentation(const QStringList &nameSpaces) = 0; virtual QMap linksForIdentifier(const QString &id) = 0; virtual QByteArray fileData(const QUrl &url) = 0; - virtual void handleHelpRequest(const QUrl &url, HelpViewerLocation location = HelpModeAlways) = 0; + virtual void showHelpUrl(const QUrl &url, HelpViewerLocation location = HelpModeAlways) = 0; }; } // HelpManager diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp index 40b1f1149bb..bd4b09060ff 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp @@ -114,7 +114,7 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(DebuggerRunConfigurationAspect m_useMultiProcess->setVisible(env.toInt()); connect(m_qmlDebuggerInfoLabel, &QLabel::linkActivated, - [](const QString &link) { Core::HelpManager::handleHelpRequest(link); }); + [](const QString &link) { Core::HelpManager::showHelpUrl(link); }); connect(m_useQmlDebugger, &QAbstractButton::toggled, this, &DebuggerRunConfigWidget::useQmlDebuggerToggled); connect(m_useQmlDebugger, &QAbstractButton::clicked, diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 11ca46bb39f..7f5971e2be4 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -460,7 +460,7 @@ void QmlEngine::errorMessageBoxFinished(int result) break; } case QMessageBox::Help: { - HelpManager::handleHelpRequest("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"); + HelpManager::showHelpUrl("qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"); Q_FALLTHROUGH(); } default: diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index ac0e573ba2f..6ec3a26d58f 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1630,7 +1630,7 @@ void WatchModel::inputNewExpression() connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept); connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject); connect(hint, &QLabel::linkActivated, [](const QString &link) { - HelpManager::handleHelpRequest(link); }); + HelpManager::showHelpUrl(link); }); if (dlg.exec() == QDialog::Accepted) m_handler->watchExpression(lineEdit->text().trimmed()); diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 4d091d6d276..d2114c4441a 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -366,7 +366,7 @@ void FormEditorData::fullInit() // Connect Qt Designer help request to HelpManager. QObject::connect(m_integration, &QtCreatorIntegration::creatorHelpRequested, HelpManager::Signals::instance(), - [](const QUrl &url) { HelpManager::handleHelpRequest(url, HelpManager::HelpModeAlways); }); + [](const QUrl &url) { HelpManager::showHelpUrl(url, HelpManager::HelpModeAlways); }); /** * This will initialize our TabOrder, Signals and slots and Buddy editors. diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index b431fd3143f..5f7943b3428 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -247,7 +247,7 @@ QByteArray HelpManager::fileData(const QUrl &url) return d->m_helpEngine->fileData(url); } -void HelpManager::handleHelpRequest(const QUrl &url, Core::HelpManager::HelpViewerLocation location) +void HelpManager::showHelpUrl(const QUrl &url, Core::HelpManager::HelpViewerLocation location) { emit m_instance->helpRequested(url, location); } diff --git a/src/plugins/help/helpmanager.h b/src/plugins/help/helpmanager.h index 1939839ec8d..825a27d0467 100644 --- a/src/plugins/help/helpmanager.h +++ b/src/plugins/help/helpmanager.h @@ -76,7 +76,7 @@ public: static void aboutToShutdown(); - Q_INVOKABLE void handleHelpRequest( + Q_INVOKABLE void showHelpUrl( const QUrl &url, Core::HelpManager::HelpViewerLocation location = Core::HelpManager::HelpModeAlways) override; diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index cb4a84f7cb7..0f8cd500a00 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -328,7 +328,7 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid, int ret = mBox.exec(); switch (ret) { case QMessageBox::Yes: - Core::HelpManager::handleHelpRequest( + Core::HelpManager::showHelpUrl( QLatin1String("qthelp://org.qt-project.qtcreator/doc/creator-developing-ios.html")); break; case QMessageBox::No: diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 120dd20a904..ba1e17cd134 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -368,7 +368,7 @@ void QmlProfilerTool::finalizeRunControl(QmlProfilerRunner *runWorker) d->m_profilerConnections->retryConnect(); break; case QMessageBox::Help: - HelpManager::handleHelpRequest( + HelpManager::showHelpUrl( "qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html"); Q_FALLTHROUGH(); case QMessageBox::Cancel: diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 406c80040be..943b9d08bd8 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -219,7 +219,7 @@ void ExamplesWelcomePage::openProject(const ExampleItem &item) ModeManager::activateMode(Core::Constants::MODE_EDIT); QUrl docUrl = QUrl::fromUserInput(item.docUrl); if (docUrl.isValid()) - HelpManager::handleHelpRequest(docUrl, HelpManager::ExternalHelpAlways); + HelpManager::showHelpUrl(docUrl, HelpManager::ExternalHelpAlways); ModeManager::activateMode(ProjectExplorer::Constants::MODE_SESSION); } else { ProjectExplorerPlugin::showOpenProjectError(result); @@ -588,7 +588,7 @@ public: else if (item.hasSourceCode) ExamplesWelcomePage::openProject(item); else - HelpManager::handleHelpRequest(QUrl::fromUserInput(item.docUrl), + HelpManager::showHelpUrl(QUrl::fromUserInput(item.docUrl), HelpManager::ExternalHelpAlways); } }