Commit beb07970 authored by Eike Ziller's avatar Eike Ziller
Browse files

LocalHelpManager: Make last methods static



Change-Id: I1b4a72437b76cefb1c457033692f20efc41c089c
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent a48adcf9
......@@ -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();
......
......@@ -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");
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment