From 0c945597db6a8363f64776d32b3bcf9bf86851af Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 14 Oct 2009 14:18:18 +0200
Subject: [PATCH] Debugger: Remove obsolete code.
---
src/plugins/debugger/watchutils.cpp | 28 ++--------------------------
src/plugins/debugger/watchutils.h | 12 ------------
2 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index e8f51d0d424..361998b4011 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -661,24 +661,6 @@ QtDumperHelper::Type QtDumperHelper::specialType(QString s)
return UnknownType;
}
-QtDumperHelper::ExpressionRequirement QtDumperHelper::expressionRequirements(Type t)
-{
-
- switch (t) {
- case QAbstractItemType:
- return NeedsComplexExpression;
- case QMapType:
- case QMultiMapType:
- case QMapNodeType:
- case StdMapType:
- return NeedsCachedExpression;
- default:
- // QObjectSlotType, QObjectSignalType need the signal number, which is numeric
- break;
- }
- return NeedsNoExpression;
-}
-
QString QtDumperHelper::qtVersionString() const
{
QString rc;
@@ -688,19 +670,13 @@ QString QtDumperHelper::qtVersionString() const
}
// Parse a list of types.
-void QtDumperHelper::parseQueryTypes(const QStringList &l, Debugger debugger)
+void QtDumperHelper::parseQueryTypes(const QStringList &l, Debugger /* debugger */)
{
m_nameTypeMap.clear();
const int count = l.count();
for (int i = 0; i < count; i++) {
const Type t = specialType(l.at(i));
- if (t != UnknownType) {
- // Exclude types that require expression syntax for CDB
- if (debugger == GdbDebugger || expressionRequirements(t) != NeedsComplexExpression)
- m_nameTypeMap.insert(l.at(i), t);
- } else {
- m_nameTypeMap.insert(l.at(i), SupportedType);
- }
+ m_nameTypeMap.insert(l.at(i), t != UnknownType ? t : SupportedType);
}
}
diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h
index 7811c98e75c..9cbb6594813 100644
--- a/src/plugins/debugger/watchutils.h
+++ b/src/plugins/debugger/watchutils.h
@@ -168,20 +168,8 @@ public:
// 'data' excludes the leading indicator character.
static bool parseValue(const char *data, QList<WatchData> *l);
- // What kind of debugger expressions are required to dump that type.
- // A debugger with restricted expression syntax can handle
- // 'NeedsNoExpression' and 'NeedsCachedExpression' if it is found in
- // the cache.
- enum ExpressionRequirement {
- NeedsNoExpression, // None, easy.
- NeedsCachedExpression, // Common values might be found in expression cache.
- NeedsComplexExpression // Totally arbitrary, adress-dependent expressions
- };
- static ExpressionRequirement expressionRequirements(Type t);
-
QString toString(bool debug = false) const;
-
static QString msgDumperOutdated(double requiredVersion, double currentVersion);
private:
--
GitLab