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

LocalHelpManager: Make last methods static

Browse Source 
Change-Id: I1b4a72437b76cefb1c457033692f20efc41c089c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2014-12-12 11:21:14 +01:00
parent a48adcf9be
commit beb0797008
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,7 +322,7 @@ HelpWidget *HelpPlugin::createHelpWidget(const Context &context, HelpWidget::Wid
// force setup, as we might have never switched to full help mode // force setup, as we might have never switched to full help mode
// thus the help engine might still run without collection file setup // thus the help engine might still run without collection file setup
m_helpManager->setupGuiHelpEngine(); LocalHelpManager::setupGuiHelpEngine();
return widget; return widget;
} }
@@ -459,10 +459,10 @@ void HelpPlugin::fontChanged()
void HelpPlugin::setupHelpEngineIfNeeded() void HelpPlugin::setupHelpEngineIfNeeded()
{ {
m_helpManager->setEngineNeedsUpdate(); LocalHelpManager::setEngineNeedsUpdate();
if (ModeManager::currentMode() == m_mode if (ModeManager::currentMode() == m_mode
|| contextHelpOption() == Core::HelpManager::ExternalHelpAlways) || contextHelpOption() == Core::HelpManager::ExternalHelpAlways)
m_helpManager->setupGuiHelpEngine(); LocalHelpManager::setupGuiHelpEngine();
} }
bool HelpPlugin::canShowHelpSideBySide() const bool HelpPlugin::canShowHelpSideBySide() const
@@ -647,7 +647,7 @@ void HelpPlugin::slotReportBug()
void HelpPlugin::doSetupIfNeeded() void HelpPlugin::doSetupIfNeeded()
{ {
m_helpManager->setupGuiHelpEngine(); LocalHelpManager::setupGuiHelpEngine();
if (m_setupNeeded) { if (m_setupNeeded) {
qApp->processEvents(); qApp->processEvents();
resetFilter(); resetFilter();

5
src/plugins/help/localhelpmanager.cpp
View File

@@ -47,6 +47,9 @@ using namespace Help::Internal;
static LocalHelpManager *m_instance = 0; static LocalHelpManager *m_instance = 0;
bool LocalHelpManager::m_guiNeedsSetup = true;
bool LocalHelpManager::m_needsCollectionFile = true;
QMutex LocalHelpManager::m_guiMutex; QMutex LocalHelpManager::m_guiMutex;
QHelpEngine* LocalHelpManager::m_guiEngine = 0; QHelpEngine* LocalHelpManager::m_guiEngine = 0;
@@ -61,8 +64,6 @@ static char kHelpHomePageKey[] = "Help/HomePage";
LocalHelpManager::LocalHelpManager(QObject *parent) LocalHelpManager::LocalHelpManager(QObject *parent)
: QObject(parent) : QObject(parent)
, m_guiNeedsSetup(true)
, m_needsCollectionFile(true)
{ {
m_instance = this; m_instance = this;
qRegisterMetaType<Help::Internal::LocalHelpManager::HelpData>("Help::Internal::LocalHelpManager::HelpData"); qRegisterMetaType<Help::Internal::LocalHelpManager::HelpData>("Help::Internal::LocalHelpManager::HelpData");

8
src/plugins/help/localhelpmanager.h
View File

@@ -64,8 +64,8 @@ public:
static QString homePage(); static QString homePage();
static void setHomePage(const QString &page); static void setHomePage(const QString &page);
void setupGuiHelpEngine(); static void setupGuiHelpEngine();
void setEngineNeedsUpdate(); static void setEngineNeedsUpdate();
static QHelpEngine& helpEngine(); static QHelpEngine& helpEngine();
static BookmarkManager& bookmarkManager(); static BookmarkManager& bookmarkManager();
@@ -86,8 +86,8 @@ signals:
void filterIndexChanged(int index); void filterIndexChanged(int index);
private: private:
bool m_guiNeedsSetup; static bool m_guiNeedsSetup;
bool m_needsCollectionFile; static bool m_needsCollectionFile;
static QStandardItemModel *m_filterModel; static QStandardItemModel *m_filterModel;
static QString m_currentFilter; static QString m_currentFilter;