From 834ebe0c4963b789ca30cce3e6783caca733cf10 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 3 Feb 2011 14:17:23 +0100 Subject: [PATCH] debugger: code cosmetics --- src/plugins/debugger/debuggerplugin.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 99e3059d26a..b37ea38c789 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2306,8 +2306,7 @@ void DebuggerPluginPrivate::clearStatusMessage() /*! Activates the previous mode when the current mode is the debug mode. */ void DebuggerPluginPrivate::activatePreviousMode() { - ModeManager *modeManager = ICore::instance()->modeManager(); - + ModeManager *modeManager = ModeManager::instance(); if (modeManager->currentMode() == modeManager->mode(MODE_DEBUG) && !m_previousMode.isEmpty()) { modeManager->activateMode(m_previousMode); @@ -2819,7 +2818,8 @@ void DebuggerPluginPrivate::extensionsInitialized() #ifdef Q_OS_WIN m_startRemoteCdbAction = new QAction(tr("Attach to Remote CDB Session..."), this); - connect(m_startRemoteCdbAction, SIGNAL(triggered()), SLOT(startRemoteCdbSession())); + connect(m_startRemoteCdbAction, SIGNAL(triggered()), + SLOT(startRemoteCdbSession())); #endif act = m_detachAction = new QAction(this); @@ -2839,7 +2839,9 @@ void DebuggerPluginPrivate::extensionsInitialized() m_visibleDebugAction->setAttribute(Utils::ProxyAction::UpdateText); m_visibleDebugAction->setAttribute(Utils::ProxyAction::UpdateIcon); m_visibleDebugAction->setAction(cmd->action()); - Core::ICore::instance()->modeManager()->addAction(m_visibleDebugAction, Constants::P_ACTION_DEBUG); + + ModeManager *modeManager = ModeManager::instance(); + modeManager->addAction(m_visibleDebugAction, Constants::P_ACTION_DEBUG); cmd = am->registerAction(m_startExternalAction, Constants::STARTEXTERNAL, globalcontext); @@ -3036,7 +3038,7 @@ void DebuggerPluginPrivate::extensionsInitialized() connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), SLOT(onModeChanged(Core::IMode*))); connect(ICore::instance(), SIGNAL(coreAboutToOpen()), - SLOT(onCoreAboutToOpen())); + SLOT(onCoreAboutToOpen())); // Debug mode setup