From f9a9dd7dbf39c07161e44daf2736ff544fd6613b Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Thu, 18 Mar 2010 16:04:14 +0100
Subject: [PATCH] fixed merge issues and cleaned up code
---
src/plugins/debugger/debuggeractions.cpp | 1 -
src/plugins/debugger/debuggeruiswitcher.cpp | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 3ffbb3c2c97..ab91e65df40 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -163,7 +163,6 @@ DebuggerSettings *DebuggerSettings::instance()
item->setText(tr("Operate by Instruction"));
item->setCheckable(true);
item->setDefaultValue(false);
- item->setSettingsKey(debugModeGroup, QLatin1String("OperateByInstruction"));
item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png"));
item->setToolTip(tr("This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single "
diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index 2c59f5f3758..2a5d6ab8c06 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -1,7 +1,9 @@
#include "debuggeruiswitcher.h"
#include "debuggermainwindow.h"
+#include "debuggeractions.h"
+#include "debuggerconstants.h"
+#include "savedaction.h"
-#include <debugger/debuggerconstants.h>
#include <utils/savedaction.h>
#include <utils/styledbar.h>
@@ -117,10 +119,9 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
delete d;
}
-void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &group)
{
d->m_debugMenu->addAction(command, group);
- m_menuCommands.insert(m_languages.indexOf(langName), command);
+ m_menuCommands.insert(d->m_languages.indexOf(langName), command);
}
void DebuggerUISwitcher::setActiveLanguage(const QString &langName)
--
GitLab