diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-10-04 15:03:39 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-16 07:19:18 +0000 |
commit | 2c2bca924ab3849bff753b91c31ee932cd7c69fc (patch) | |
tree | 9d57b7819a9f269f90d859b41d2d11b540a2e599 | |
parent | f467badc2f347522918d99da47dec00720a03bb3 (diff) |
Help: Remove functionality of unregistering namespace from public API
Only used by the options page and generally needs knowledge of help
namespaces, which requires querying QtHelp.
Change-Id: Id8eda86e5b373ab3214e8eff6e2e3ce92c1239ba
Reviewed-by: David Schulz <david.schulz@qt.io>
-rw-r--r-- | src/plugins/coreplugin/helpmanager.cpp | 6 | ||||
-rw-r--r-- | src/plugins/coreplugin/helpmanager.h | 1 | ||||
-rw-r--r-- | src/plugins/coreplugin/helpmanager_implementation.h | 1 | ||||
-rw-r--r-- | src/plugins/help/docsettingspage.cpp | 3 | ||||
-rw-r--r-- | src/plugins/help/helpmanager.cpp | 4 | ||||
-rw-r--r-- | src/plugins/help/helpmanager.h | 3 |
6 files changed, 5 insertions, 13 deletions
diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp index 20c6adf83b..357adf1312 100644 --- a/src/plugins/coreplugin/helpmanager.cpp +++ b/src/plugins/coreplugin/helpmanager.cpp @@ -80,12 +80,6 @@ void registerDocumentation(const QStringList &files) m_instance->registerDocumentation(files); } -void unregisterDocumentation(const QStringList &nameSpaces) -{ - if (checkInstance()) - m_instance->unregisterDocumentation(nameSpaces); -} - QMap<QString, QUrl> linksForIdentifier(const QString &id) { return checkInstance() ? m_instance->linksForIdentifier(id) : QMap<QString, QUrl>(); diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index 4f4484c65d..12a3ac7b1e 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -61,7 +61,6 @@ enum HelpViewerLocation { CORE_EXPORT QString documentationPath(); CORE_EXPORT void registerDocumentation(const QStringList &fileNames); -CORE_EXPORT void unregisterDocumentation(const QStringList &nameSpaces); CORE_EXPORT QMap<QString, QUrl> linksForIdentifier(const QString &id); CORE_EXPORT QMap<QString, QUrl> linksForKeyword(const QString &id); diff --git a/src/plugins/coreplugin/helpmanager_implementation.h b/src/plugins/coreplugin/helpmanager_implementation.h index 6c160c7ce3..89296691ee 100644 --- a/src/plugins/coreplugin/helpmanager_implementation.h +++ b/src/plugins/coreplugin/helpmanager_implementation.h @@ -39,7 +39,6 @@ protected: public: virtual void registerDocumentation(const QStringList &fileNames) = 0; - virtual void unregisterDocumentation(const QStringList &nameSpaces) = 0; virtual QMap<QString, QUrl> linksForIdentifier(const QString &id) = 0; virtual QMap<QString, QUrl> linksForKeyword(const QString &keyword) = 0; virtual QByteArray fileData(const QUrl &url) = 0; diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index 36b9665e04..3fb941367e 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -27,7 +27,6 @@ #include "helpconstants.h" #include "helpmanager.h" -#include <coreplugin/helpmanager.h> #include <utils/algorithm.h> #include <QFileDialog> @@ -244,7 +243,7 @@ void DocSettingsPage::addDocumentation() void DocSettingsPage::apply() { - Core::HelpManager::unregisterDocumentation(m_filesToUnregister.keys()); + HelpManager::unregisterNamespaces(m_filesToUnregister.keys()); QStringList files; auto it = m_filesToRegisterUserManaged.constBegin(); while (it != m_filesToRegisterUserManaged.constEnd()) { diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index d6dfef6b20..6d41b79ff3 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -172,7 +172,7 @@ void HelpManager::registerDocumentationNow(QFutureInterface<bool> &futureInterfa futureInterface.reportResult(docsChanged); } -void HelpManager::unregisterDocumentation(const QStringList &nameSpaces) +void HelpManager::unregisterNamespaces(const QStringList &nameSpaces) { if (d->m_needsSetup) { for (const QString &name : nameSpaces) @@ -372,7 +372,7 @@ void HelpManager::setupHelpManager() d->cleanUpDocumentation(); if (!d->m_nameSpacesToUnregister.isEmpty()) { - m_instance->unregisterDocumentation(Utils::toList(d->m_nameSpacesToUnregister)); + m_instance->unregisterNamespaces(Utils::toList(d->m_nameSpacesToUnregister)); d->m_nameSpacesToUnregister.clear(); } diff --git a/src/plugins/help/helpmanager.h b/src/plugins/help/helpmanager.h index 3a65b0f33d..49ca60f468 100644 --- a/src/plugins/help/helpmanager.h +++ b/src/plugins/help/helpmanager.h @@ -49,7 +49,8 @@ public: static QString collectionFilePath(); void registerDocumentation(const QStringList &fileNames) override; - void unregisterDocumentation(const QStringList &nameSpaces) override; + + static void unregisterNamespaces(const QStringList &nameSpaces); static void registerUserDocumentation(const QStringList &filePaths); static QSet<QString> userDocumentationPaths(); |