From 828b1f96168a6dc6b535f68b0c70cfce625e4471 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 1 Oct 2009 16:23:26 +0200
Subject: [PATCH] debugger: better updating of the stack and debugger view
location marker
---
src/plugins/debugger/debuggeragents.cpp | 8 ++++++--
src/plugins/debugger/debuggeragents.h | 1 +
src/plugins/debugger/debuggermanager.cpp | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index 873ab3575b8..fbdf2180020 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -201,13 +201,17 @@ DisassemblerViewAgent::~DisassemblerViewAgent()
void DisassemblerViewAgent::cleanup()
{
d->cache.clear();
- if (d->editor)
- d->editor->markableInterface()->removeMark(d->locationMark);
//if (d->editor)
// d->editor->deleteLater();
//d->editor = 0;
}
+void DisassemblerViewAgent::resetLocation()
+{
+ if (d->editor)
+ d->editor->markableInterface()->removeMark(d->locationMark);
+}
+
void DisassemblerViewAgent::setFrame(const StackFrame &frame)
{
d->frame = frame;
diff --git a/src/plugins/debugger/debuggeragents.h b/src/plugins/debugger/debuggeragents.h
index d0eba7776e7..0fbe380e9fb 100644
--- a/src/plugins/debugger/debuggeragents.h
+++ b/src/plugins/debugger/debuggeragents.h
@@ -83,6 +83,7 @@ public:
~DisassemblerViewAgent();
void setFrame(const StackFrame &frame);
+ void resetLocation();
Q_SLOT void setContents(const QString &contents);
QString address() const;
void cleanup();
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index e141c5746a9..e2c99bb5c73 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -1348,6 +1348,8 @@ void DebuggerManager::jumpToLineExec()
void DebuggerManager::resetLocation()
{
+ d->m_disassemblerViewAgent.resetLocation();
+ d->m_stackHandler->setCurrentIndex(-1);
// Connected to the plugin.
emit resetLocationRequested();
}
--
GitLab