From ea4b64dee461f4a7a4c5e1d2ea373e4d5ba95d34 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 28 Sep 2010 13:09:19 +0200
Subject: [PATCH] debugger: remove rarely needed "Recheck Debuggging Helper
Availability" context menu entry.
It was more a debugger debugging aid in the early days of compiled dumpers
anyway.
Reviewed-by: Friedemann Kleint
---
src/plugins/debugger/debuggeractions.cpp | 3 ---
src/plugins/debugger/debuggeractions.h | 1 -
src/plugins/debugger/debuggerplugin.cpp | 2 --
src/plugins/debugger/gdb/classicgdbengine.cpp | 11 ----------
src/plugins/debugger/gdb/gdbengine.cpp | 2 --
src/plugins/debugger/gdb/gdbengine.h | 1 -
src/plugins/debugger/watchwindow.cpp | 21 ++++++++-----------
7 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 8a0eba727c5..670db758c00 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -317,9 +317,6 @@ DebuggerSettings *DebuggerSettings::instance()
item->setValue(true);
instance->insertItem(UseCodeModel, item);
- item = new SavedAction(instance);
- item->setText(tr("Recheck Debugging Helper Availability"));
- instance->insertItem(RecheckDebuggingHelpers, item);
//
// Breakpoints
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index 6fd56fb64fa..c0ef28a8f37 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -94,7 +94,6 @@ enum DebuggerActionCode
OperateByInstruction,
AutoDerefPointers,
- RecheckDebuggingHelpers,
UseDebuggingHelpers,
UseCustomDebuggingHelperLocation,
CustomDebuggingHelperLocation,
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 56f165db766..34d1b5b591f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2235,7 +2235,6 @@ void DebuggerPluginPrivate::setInitialState()
m_actions.jumpToLineAction2->setEnabled(false);
m_actions.nextAction->setEnabled(false);
- theDebuggerAction(RecheckDebuggingHelpers)->setEnabled(false);
theDebuggerAction(AutoDerefPointers)->setEnabled(true);
theDebuggerAction(ExpandStack)->setEnabled(false);
theDebuggerAction(ExecuteCommand)->setEnabled(m_state == InferiorStopOk);
@@ -2347,7 +2346,6 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
m_actions.nextAction->setEnabled(stopped);
- theDebuggerAction(RecheckDebuggingHelpers)->setEnabled(actionsEnabled);
const bool canDeref = actionsEnabled
&& (m_capabilities & AutoDerefPointersCapability);
theDebuggerAction(AutoDerefPointers)->setEnabled(canDeref);
diff --git a/src/plugins/debugger/gdb/classicgdbengine.cpp b/src/plugins/debugger/gdb/classicgdbengine.cpp
index 16d3a268552..6918f23c20f 100644
--- a/src/plugins/debugger/gdb/classicgdbengine.cpp
+++ b/src/plugins/debugger/gdb/classicgdbengine.cpp
@@ -569,17 +569,6 @@ void GdbEngine::tryQueryDebuggingHelpersClassic()
CB(handleQueryDebuggingHelperClassic));
}
-void GdbEngine::recheckDebuggingHelperAvailabilityClassic()
-{
- PRECONDITION;
- if (m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperNotAvailable) {
- // Retrieve list of dumpable classes.
- postCommand("call (void*)qDumpObjectData440(1,0,0,0,0,0,0,0)");
- postCommand("p (char*)&qDumpOutBuffer",
- CB(handleQueryDebuggingHelperClassic));
- }
-}
-
// Called from CoreAdapter and AttachAdapter
void GdbEngine::updateAllClassic()
{
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 27311de6e85..ec860d875aa 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1781,8 +1781,6 @@ void GdbEngine::setupEngine()
this, SLOT(setUseDebuggingHelpers(QVariant)));
connect(theDebuggerAction(DebugDebuggingHelpers), SIGNAL(valueChanged(QVariant)),
this, SLOT(setDebugDebuggingHelpersClassic(QVariant)));
- connect(theDebuggerAction(RecheckDebuggingHelpers), SIGNAL(triggered()),
- this, SLOT(recheckDebuggingHelperAvailabilityClassic()));
}
QTC_ASSERT(state() == EngineSetupRequested, /**/);
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index c4b90b80da8..210b1c67817 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -516,7 +516,6 @@ private: ////////// View & Data Stuff //////////
void setDebuggingHelperStateClassic(DebuggingHelperState);
void tryLoadDebuggingHelpersClassic();
void tryQueryDebuggingHelpersClassic();
- Q_SLOT void recheckDebuggingHelperAvailabilityClassic();
Q_SLOT void setDebugDebuggingHelpersClassic(const QVariant &on);
Q_SLOT void setUseDebuggingHelpers(const QVariant &on);
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index b1b46cc49a2..878b0a11db4 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -376,20 +376,8 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
menu.addAction(actSetWatchPointAtPointerValue);
menu.addSeparator();
- menu.addAction(theDebuggerAction(RecheckDebuggingHelpers));
menu.addAction(theDebuggerAction(UseDebuggingHelpers));
- QAction *actClearCodeModelSnapshot
- = new QAction(tr("Refresh Code Model Snapshot"), &menu);
- actClearCodeModelSnapshot->setEnabled(actionsEnabled
- && theDebuggerAction(UseCodeModel)->isChecked());
- menu.addAction(actClearCodeModelSnapshot);
- QAction *actShowInEditor
- = new QAction(tr("Show View Contents in Editor"), &menu);
- actShowInEditor->setEnabled(actionsEnabled);
- menu.addAction(actShowInEditor);
- menu.addSeparator();
menu.addAction(theDebuggerAction(UseToolTipsInLocalsView));
-
menu.addAction(theDebuggerAction(AutoDerefPointers));
menu.addAction(theDebuggerAction(ShowStdNamespace));
menu.addAction(theDebuggerAction(ShowQtNamespace));
@@ -403,6 +391,15 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
actAlwaysAdjustColumnWidth->setChecked(m_alwaysResizeColumnsToContents);
menu.addSeparator();
+ QAction *actClearCodeModelSnapshot
+ = new QAction(tr("Refresh Code Model Snapshot"), &menu);
+ actClearCodeModelSnapshot->setEnabled(actionsEnabled
+ && theDebuggerAction(UseCodeModel)->isChecked());
+ menu.addAction(actClearCodeModelSnapshot);
+ QAction *actShowInEditor
+ = new QAction(tr("Show View Contents in Editor"), &menu);
+ actShowInEditor->setEnabled(actionsEnabled);
+ menu.addAction(actShowInEditor);
menu.addAction(theDebuggerAction(SettingsDialog));
QAction *act = menu.exec(ev->globalPos());
--
GitLab