diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 69aa2597d260091454a11edaea6fd6f5e6142ec7..8d5a983860e6f08baa92bc83667f8ab8611080c6 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -632,7 +632,7 @@ void HelpPlugin::showHideSidebar() void HelpPlugin::showExternalWindow() { bool firstTime = m_firstModeChange; - setup(); + doSetupIfNeeded(); m_externalHelpBar->setVisible(true); m_internalHelpBar->setVisible(false); m_externalWindow->show(); @@ -647,7 +647,7 @@ void HelpPlugin::modeChanged(Core::IMode *mode, Core::IMode *old) if (mode == m_mode) { m_oldMode = old; qApp->setOverrideCursor(Qt::WaitCursor); - setup(); + doSetupIfNeeded(); qApp->restoreOverrideCursor(); } } @@ -702,7 +702,7 @@ QStackedLayout * layoutForWidget(QWidget *parent, QWidget *widget) void HelpPlugin::contextHelpOptionChanged() { - setup(); + doSetupIfNeeded(); QWidget *modeWidget = m_mode->widget(); if (modeWidget == m_splitter && contextHelpOption() == Help::Constants::ExternalHelpAlways) { @@ -1103,7 +1103,7 @@ void HelpPlugin::slotOpenActionUrl(QAction *action) } } -void HelpPlugin::setup() +void HelpPlugin::doSetupIfNeeded() { m_helpManager->setupGuiHelpEngine(); if (m_firstModeChange) { diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h index 63e420c8748d3da5e55b94b695cdb7a5518b0ff8..3cb96a6c9c44a4c1dfee89147c5a4a21e0c221d1 100644 --- a/src/plugins/help/helpplugin.h +++ b/src/plugins/help/helpplugin.h @@ -119,7 +119,7 @@ private: HelpViewer* viewerForContextMode(); void createRightPaneContextViewer(); - void setup(); + void doSetupIfNeeded(); int contextHelpOption() const; void connectExternalHelpWindow(); void setupNavigationMenus(QAction *back, QAction *next, QWidget *parent);