summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/debugger/debuggerconstants.h3
-rw-r--r--src/plugins/debugger/debuggerengine.cpp13
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 0460cb08e1..02517dc65c 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -64,9 +64,6 @@ const char QML_UPDATE_ON_SAVE[] = "Debugger.QmlUpdateOnSave";
const char QML_SELECTTOOL[] = "Debugger.QmlSelectTool";
const char QML_ZOOMTOOL[] = "Debugger.QmlZoomTool";
-// VariableManager Prefix
-const char PrefixDebugExecutable[] = "DebuggedExecutable";
-
const char TASK_CATEGORY_DEBUGGER_DEBUGINFO[] = "Debuginfo";
const char TASK_CATEGORY_DEBUGGER_RUNTIME[] = "DebugRuntime";
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 71b644562e..f3b7315dbc 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -92,6 +92,9 @@ enum { debug = 0 };
//
///////////////////////////////////////////////////////////////////////
+// VariableManager Prefix
+const char PrefixDebugExecutable[] = "DebuggedExecutable";
+
namespace Debugger {
Internal::Location::Location(const StackFrame &frame, bool marker)
@@ -172,7 +175,7 @@ public:
connect(&m_locationTimer, SIGNAL(timeout()), SLOT(resetLocation()));
connect(debuggerCore()->action(IntelFlavor), SIGNAL(valueChanged(QVariant)),
SLOT(reloadDisassembly()));
- VariableManager::registerFileVariables(Constants::PrefixDebugExecutable,
+ VariableManager::registerFileVariables(PrefixDebugExecutable,
tr("Debugged executable"));
connect(VariableManager::instance(), SIGNAL(variableUpdateRequested(QByteArray)),
SLOT(updateVariable(QByteArray)));
@@ -187,11 +190,11 @@ public slots:
void doInterruptInferior();
void doFinishDebugger();
- void updateVariable(QByteArray variable)
+ void updateVariable(const QByteArray &variable)
{
- if (VariableManager::isFileVariable(variable, Constants::PrefixDebugExecutable))
- VariableManager::insert(variable, VariableManager::fileVariableValue(variable,
- Constants::PrefixDebugExecutable, QFileInfo(m_startParameters.executable)));
+ if (VariableManager::isFileVariable(variable, PrefixDebugExecutable))
+ VariableManager::insert(variable,
+ VariableManager::fileVariableValue(variable, PrefixDebugExecutable, m_startParameters.executable));
}
void reloadDisassembly()