From 0ee09af63aa014dabe26af9da10b4f51731a71d7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 27 Oct 2009 14:53:09 +0100
Subject: [PATCH] eliminate handleDebuggingHelperValue1()
doesn't seem to serve any purpose at this time.
---
src/plugins/debugger/gdb/gdbengine.cpp | 27 ++------------------------
src/plugins/debugger/gdb/gdbengine.h | 1 -
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 5e4ce411a7d..b2e818724eb 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2762,15 +2762,13 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
<<',' << addr << ',' << (dumpChildren ? "1" : "0")
<< ',' << extraArgs.join(QString(_c(','))) << ')';
- QVariant var;
- var.setValue(data);
- postCommand(cmd, WatchUpdate | EmbedToken, CB(handleDebuggingHelperValue1), var);
+ postCommand(cmd, WatchUpdate);
showStatusMessage(msgRetrievingWatchData(m_pendingRequests + 1), 10000);
// retrieve response
postCommand(_("p (char*)&qDumpOutBuffer"), WatchUpdate,
- CB(handleDebuggingHelperValue2), var);
+ CB(handleDebuggingHelperValue2), qVariantFromValue(data));
}
void GdbEngine::createGdbVariable(const WatchData &data)
@@ -3197,27 +3195,6 @@ void GdbEngine::handleDebuggingHelperSetup(const GdbResponse &response)
}
}
-void GdbEngine::handleDebuggingHelperValue1(const GdbResponse &response)
-{
- WatchData data = response.cookie.value<WatchData>();
- QTC_ASSERT(data.isValid(), return);
- if (response.resultClass == GdbResultDone) {
- // ignore this case, data will follow
- } else {
- QString msg = QString::fromLocal8Bit(response.data.findChild("msg").data());
-#ifdef QT_DEBUG
- // Make debugging of dumpers easier
- if (theDebuggerBoolSetting(DebugDebuggingHelpers)
- && msg.startsWith(__("The program being debugged stopped while"))
- && msg.contains(__("qDumpObjectData440"))) {
- // Fake full stop
- postCommand(_("p 3"), CB(handleStop2)); // dummy
- return;
- }
-#endif
- }
-}
-
void GdbEngine::handleDebuggingHelperValue2(const GdbResponse &response)
{
WatchData data = response.cookie.value<WatchData>();
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 57683529fed..6fac193e79a 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -418,7 +418,6 @@ private: ////////// View & Data Stuff //////////
void handleEvaluateExpression(const GdbResponse &response);
//void handleToolTip(const GdbResponse &response);
void handleQueryDebuggingHelper(const GdbResponse &response);
- void handleDebuggingHelperValue1(const GdbResponse &response);
void handleDebuggingHelperValue2(const GdbResponse &response);
void handleDebuggingHelperValue3(const GdbResponse &response);
void handleDebuggingHelperEditValue(const GdbResponse &response);
--
GitLab