Commit 834ebe0c authored by hjk's avatar hjk
Browse files

debugger: code cosmetics

parent 91ead6c8
...@@ -2306,8 +2306,7 @@ void DebuggerPluginPrivate::clearStatusMessage() ...@@ -2306,8 +2306,7 @@ void DebuggerPluginPrivate::clearStatusMessage()
/*! Activates the previous mode when the current mode is the debug mode. */ /*! Activates the previous mode when the current mode is the debug mode. */
void DebuggerPluginPrivate::activatePreviousMode() void DebuggerPluginPrivate::activatePreviousMode()
{ {
ModeManager *modeManager = ICore::instance()->modeManager(); ModeManager *modeManager = ModeManager::instance();
if (modeManager->currentMode() == modeManager->mode(MODE_DEBUG) if (modeManager->currentMode() == modeManager->mode(MODE_DEBUG)
&& !m_previousMode.isEmpty()) { && !m_previousMode.isEmpty()) {
modeManager->activateMode(m_previousMode); modeManager->activateMode(m_previousMode);
...@@ -2819,7 +2818,8 @@ void DebuggerPluginPrivate::extensionsInitialized() ...@@ -2819,7 +2818,8 @@ void DebuggerPluginPrivate::extensionsInitialized()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
m_startRemoteCdbAction = new QAction(tr("Attach to Remote CDB Session..."), this); 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 #endif
act = m_detachAction = new QAction(this); act = m_detachAction = new QAction(this);
...@@ -2839,7 +2839,9 @@ void DebuggerPluginPrivate::extensionsInitialized() ...@@ -2839,7 +2839,9 @@ void DebuggerPluginPrivate::extensionsInitialized()
m_visibleDebugAction->setAttribute(Utils::ProxyAction::UpdateText); m_visibleDebugAction->setAttribute(Utils::ProxyAction::UpdateText);
m_visibleDebugAction->setAttribute(Utils::ProxyAction::UpdateIcon); m_visibleDebugAction->setAttribute(Utils::ProxyAction::UpdateIcon);
m_visibleDebugAction->setAction(cmd->action()); 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, cmd = am->registerAction(m_startExternalAction,
Constants::STARTEXTERNAL, globalcontext); Constants::STARTEXTERNAL, globalcontext);
...@@ -3036,7 +3038,7 @@ void DebuggerPluginPrivate::extensionsInitialized() ...@@ -3036,7 +3038,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
SLOT(onModeChanged(Core::IMode*))); SLOT(onModeChanged(Core::IMode*)));
connect(ICore::instance(), SIGNAL(coreAboutToOpen()), connect(ICore::instance(), SIGNAL(coreAboutToOpen()),
SLOT(onCoreAboutToOpen())); SLOT(onCoreAboutToOpen()));
// Debug mode setup // Debug mode setup
......
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