From a59a1e5d37d989250f090366d01faf199f0d8a94 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 21 Jul 2010 14:54:02 +0200
Subject: [PATCH] Use new function signature. Small code cleanup.
---
src/plugins/help/helpplugin.cpp | 32 +++++++++++++++-----------------
src/plugins/help/helpplugin.h | 2 +-
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index b216617fc65..b9ada606e35 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -307,8 +307,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
SLOT(switchToHelpMode(QUrl)));
QDesktopServices::setUrlHandler("qthelp", this, "handleHelpRequest");
- connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*)),
- this, SLOT(modeChanged(Core::IMode*)));
+ connect(m_core->modeManager(), SIGNAL(currentModeChanged(Core::IMode*,
+ Core::IMode*)), this, SLOT(modeChanged(Core::IMode*, Core::IMode*)));
addAutoReleasedObject(m_mode = new HelpMode(m_splitter, m_centralWidget));
m_mode->setContext(modecontext);
@@ -570,23 +570,21 @@ void HelpPlugin::slotHideRightPane()
Core::RightPaneWidget::instance()->setShown(false);
}
-void HelpPlugin::modeChanged(Core::IMode *mode)
+void HelpPlugin::modeChanged(Core::IMode *mode, Core::IMode *old)
{
- if (mode == m_mode && m_firstModeChange) {
- m_firstModeChange = false;
-
- qApp->processEvents();
+ Q_UNUSED(old)
+ if (mode == m_mode) {
qApp->setOverrideCursor(Qt::WaitCursor);
-
- m_helpManager->setupGuiHelpEngine();
- setupUi();
- resetFilter();
- OpenPagesManager::instance().setupInitialPages();
-
- qApp->restoreOverrideCursor();
- } else if (mode == m_mode && !m_firstModeChange) {
- qApp->setOverrideCursor(Qt::WaitCursor);
- m_helpManager->setupGuiHelpEngine();
+ if (m_firstModeChange) {
+ qApp->processEvents();
+ m_helpManager->setupGuiHelpEngine();
+ setupUi();
+ resetFilter();
+ m_firstModeChange = false;
+ OpenPagesManager::instance().setupInitialPages();
+ } else {
+ m_helpManager->setupGuiHelpEngine();
+ }
qApp->restoreOverrideCursor();
}
}
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 5fba3590d1a..c25f55189d1 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -73,7 +73,7 @@ public:
ShutdownFlag aboutToShutdown();
private slots:
- void modeChanged(Core::IMode *mode);
+ void modeChanged(Core::IMode *mode, Core::IMode *old);
void activateContext();
void activateIndex();
--
GitLab