From ffdd1765ca0ddbf8747867bc1ca1a7d930f7d862 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 25 Aug 2010 16:18:52 +0200
Subject: [PATCH] Better naming.
---
src/plugins/help/helpplugin.cpp | 8 ++++----
src/plugins/help/helpplugin.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 69aa2597d26..8d5a983860e 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 63e420c8748..3cb96a6c9c4 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);
--
GitLab