diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-12 11:21:14 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-17 16:46:41 +0100 |
commit | beb0797008980869f52b7549fd4ad2fac0eba72b (patch) | |
tree | 5898fd0ca1a53c5f3c9b7971df3ad7a21fdbfdb0 /src/plugins/help | |
parent | a48adcf9be144eff9f22f30195e834f869fe19b4 (diff) | |
download | qt-creator-beb0797008980869f52b7549fd4ad2fac0eba72b.tar.gz |
LocalHelpManager: Make last methods static
Change-Id: I1b4a72437b76cefb1c457033692f20efc41c089c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/help')
-rw-r--r-- | src/plugins/help/helpplugin.cpp | 10 | ||||
-rw-r--r-- | src/plugins/help/localhelpmanager.cpp | 5 | ||||
-rw-r--r-- | src/plugins/help/localhelpmanager.h | 8 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index a86d77dacd..a15a421256 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -322,7 +322,7 @@ HelpWidget *HelpPlugin::createHelpWidget(const Context &context, HelpWidget::Wid // force setup, as we might have never switched to full help mode // thus the help engine might still run without collection file setup - m_helpManager->setupGuiHelpEngine(); + LocalHelpManager::setupGuiHelpEngine(); return widget; } @@ -459,10 +459,10 @@ void HelpPlugin::fontChanged() void HelpPlugin::setupHelpEngineIfNeeded() { - m_helpManager->setEngineNeedsUpdate(); + LocalHelpManager::setEngineNeedsUpdate(); if (ModeManager::currentMode() == m_mode - || contextHelpOption() == Core::HelpManager::ExternalHelpAlways) - m_helpManager->setupGuiHelpEngine(); + || contextHelpOption() == Core::HelpManager::ExternalHelpAlways) + LocalHelpManager::setupGuiHelpEngine(); } bool HelpPlugin::canShowHelpSideBySide() const @@ -647,7 +647,7 @@ void HelpPlugin::slotReportBug() void HelpPlugin::doSetupIfNeeded() { - m_helpManager->setupGuiHelpEngine(); + LocalHelpManager::setupGuiHelpEngine(); if (m_setupNeeded) { qApp->processEvents(); resetFilter(); diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 9bbe007456..249d691280 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -47,6 +47,9 @@ using namespace Help::Internal; static LocalHelpManager *m_instance = 0; +bool LocalHelpManager::m_guiNeedsSetup = true; +bool LocalHelpManager::m_needsCollectionFile = true; + QMutex LocalHelpManager::m_guiMutex; QHelpEngine* LocalHelpManager::m_guiEngine = 0; @@ -61,8 +64,6 @@ static char kHelpHomePageKey[] = "Help/HomePage"; LocalHelpManager::LocalHelpManager(QObject *parent) : QObject(parent) - , m_guiNeedsSetup(true) - , m_needsCollectionFile(true) { m_instance = this; qRegisterMetaType<Help::Internal::LocalHelpManager::HelpData>("Help::Internal::LocalHelpManager::HelpData"); diff --git a/src/plugins/help/localhelpmanager.h b/src/plugins/help/localhelpmanager.h index 4ca4067505..b2c4cd3705 100644 --- a/src/plugins/help/localhelpmanager.h +++ b/src/plugins/help/localhelpmanager.h @@ -64,8 +64,8 @@ public: static QString homePage(); static void setHomePage(const QString &page); - void setupGuiHelpEngine(); - void setEngineNeedsUpdate(); + static void setupGuiHelpEngine(); + static void setEngineNeedsUpdate(); static QHelpEngine& helpEngine(); static BookmarkManager& bookmarkManager(); @@ -86,8 +86,8 @@ signals: void filterIndexChanged(int index); private: - bool m_guiNeedsSetup; - bool m_needsCollectionFile; + static bool m_guiNeedsSetup; + static bool m_needsCollectionFile; static QStandardItemModel *m_filterModel; static QString m_currentFilter; |