From 2a18859f2e1ef8593204bfd42ce553dbd3e7e76a Mon Sep 17 00:00:00 2001 From: hjk <hjk121@nokiamail.com> Date: Tue, 7 Jan 2014 15:46:48 +0100 Subject: [PATCH] Debugger: Remove unused code More fallout from the non-Python removal. Change-Id: I15534dd92dfa9823e0a7d609c13f8a71caa9b093 Reviewed-by: hjk <hjk121@nokiamail.com> --- src/plugins/debugger/gdb/gdbengine.cpp | 33 ------------------- src/plugins/debugger/gdb/gdbengine.h | 10 ------ .../projectexplorer/settingsaccessor.cpp | 2 -- 3 files changed, 45 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 1f7ec3d9287..81397766fe6 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -206,7 +206,6 @@ GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters) setObjectName(_("GdbEngine")); m_busy = false; - m_debuggingHelperState = DebuggingHelperUninitialized; m_gdbVersion = 100; m_isQnxGdb = false; m_registerNamesListed = false; @@ -3669,38 +3668,6 @@ void GdbEngine::rebuildWatchModel() showToolTip(); } -static QByteArray arrayFillCommand(const char *array, const QByteArray ¶ms) -{ - QString buf; - buf.sprintf("set {char[%d]} &%s = {", params.size(), array); - QByteArray encoded; - encoded.append(buf.toLocal8Bit()); - const int size = params.size(); - for (int i = 0; i != size; ++i) { - buf.sprintf("%d,", int(params[i])); - encoded.append(buf.toLocal8Bit()); - } - encoded[encoded.size() - 1] = '}'; - return encoded; -} - -void GdbEngine::sendWatchParameters(const QByteArray ¶ms0) -{ - QByteArray params = params0; - params.append('\0'); - const QByteArray inBufferCmd = arrayFillCommand("qDumpInBuffer", params); - - params.replace('\0','!'); - showMessage(QString::fromUtf8(params), LogMiscInput); - - params.clear(); - params.append('\0'); - const QByteArray outBufferCmd = arrayFillCommand("qDumpOutBuffer", params); - - postCommand(inBufferCmd); - postCommand(outBufferCmd); -} - void GdbEngine::handleVarAssign(const GdbResponse &) { // Everything might have changed, force re-evaluation. diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index e98d0dd9dad..a419dc1b297 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -58,14 +58,6 @@ class WatchData; class DisassemblerAgentCookie; class DisassemblerLines; -enum DebuggingHelperState -{ - DebuggingHelperUninitialized, - DebuggingHelperLoadTried, - DebuggingHelperAvailable, - DebuggingHelperUnavailable -}; - class GdbEngine : public Debugger::DebuggerEngine { Q_OBJECT @@ -449,7 +441,6 @@ protected: void showToolTip(); void insertData(const WatchData &data); - void sendWatchParameters(const QByteArray ¶ms0); void handleVarAssign(const GdbResponse &response); void handleDetach(const GdbResponse &response); @@ -480,7 +471,6 @@ protected: // void reloadDebuggingHelpers(); - DebuggingHelperState m_debuggingHelperState; QByteArray m_qtNamespace; QString m_gdb; diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 64f73942e8b..4b9d661748a 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -1233,8 +1233,6 @@ QVariantMap Version0Handler::convertRunConfigurations(Project *project, const QV result.insert(QLatin1String("Qt4ProjectManager.MaemoRunConfiguration.DeviceId"), i.value()); else if (i.key() == QLatin1String("LastDeployed")) result.insert(QLatin1String("Qt4ProjectManager.MaemoRunConfiguration.LastDeployed"), i.value()); - else if (i.key() == QLatin1String("DebuggingHelpersLastDeployed")) - result.insert(QLatin1String("Qt4ProjectManager.MaemoRunConfiguration.DebuggingHelpersLastDeployed"), i.value()); else qWarning() << "Unknown MaemoRunConfiguration key found:" << i.key() << i.value(); } else if (QLatin1String("ProjectExplorer.CustomExecutableRunConfiguration") == id) { -- GitLab