Commit f9a9dd7d authored by Lasse Holmstedt's avatar Lasse Holmstedt
Browse files

fixed merge issues and cleaned up code

parent 492fffb4
...@@ -163,7 +163,6 @@ DebuggerSettings *DebuggerSettings::instance() ...@@ -163,7 +163,6 @@ DebuggerSettings *DebuggerSettings::instance()
item->setText(tr("Operate by Instruction")); item->setText(tr("Operate by Instruction"));
item->setCheckable(true); item->setCheckable(true);
item->setDefaultValue(false); item->setDefaultValue(false);
item->setSettingsKey(debugModeGroup, QLatin1String("OperateByInstruction"));
item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png")); item->setIcon(QIcon(":/debugger/images/SingleInstructionMode.png"));
item->setToolTip(tr("This switches the debugger to instruction-wise " item->setToolTip(tr("This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single " "operation mode. In this mode, stepping operates on single "
......
#include "debuggeruiswitcher.h" #include "debuggeruiswitcher.h"
#include "debuggermainwindow.h" #include "debuggermainwindow.h"
#include "debuggeractions.h"
#include "debuggerconstants.h"
#include "savedaction.h"
#include <debugger/debuggerconstants.h>
#include <utils/savedaction.h> #include <utils/savedaction.h>
#include <utils/styledbar.h> #include <utils/styledbar.h>
...@@ -117,10 +119,9 @@ DebuggerUISwitcher::~DebuggerUISwitcher() ...@@ -117,10 +119,9 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
delete d; delete d;
} }
void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &group)
{ {
d->m_debugMenu->addAction(command, 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) void DebuggerUISwitcher::setActiveLanguage(const QString &langName)
......
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