diff --git a/src/plugins/debugger/watchdata.cpp b/src/plugins/debugger/watchdata.cpp index c2eec8d9769..4230f601631 100644 --- a/src/plugins/debugger/watchdata.cpp +++ b/src/plugins/debugger/watchdata.cpp @@ -131,7 +131,6 @@ WatchData::WatchData() : wantsChildren(false), valueEnabled(true), valueEditable(true), - error(false), sortId(0), source(0) { @@ -146,14 +145,12 @@ bool WatchData::isEqual(const WatchData &other) const && editvalue == other.editvalue && type == other.type && displayedType == other.displayedType - && variable == other.variable && address == other.address && size == other.size && elided == other.elided && wantsChildren == other.wantsChildren && valueEnabled == other.valueEnabled - && valueEditable == other.valueEditable - && error == other.error; + && valueEditable == other.valueEditable; } bool WatchData::isAncestorOf(const QByteArray &childIName) const @@ -180,7 +177,6 @@ void WatchData::setError(const QString &msg) wantsChildren = false; valueEnabled = false; valueEditable = false; - error = true; } void WatchData::setValue(const QString &value0) @@ -299,8 +295,6 @@ QString WatchData::toString() const str << "sortId=\"" << sortId << doubleQuoteComma; if (!name.isEmpty() && name != QLatin1String(iname)) str << "name=\"" << name << doubleQuoteComma; - if (error) - str << "error,"; if (address) { str.setIntegerBase(16); str << "addr=\"0x" << address << doubleQuoteComma; @@ -314,9 +308,6 @@ QString WatchData::toString() const if (!exp.isEmpty()) str << "exp=\"" << exp << doubleQuoteComma; - if (!variable.isEmpty()) - str << "variable=\"" << variable << doubleQuoteComma; - if (isValueNeeded()) str << "value=,"; if (!value.isEmpty()) diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h index 10b1eb0f611..8c23b6c51bd 100644 --- a/src/plugins/debugger/watchdata.h +++ b/src/plugins/debugger/watchdata.h @@ -125,14 +125,12 @@ public: bool wantsChildren; bool valueEnabled; // Value will be enabled or not bool valueEditable; // Value will be editable - bool error; qint32 sortId; Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler) public: // FIXME: this is engine specific data that should be mapped internally - QByteArray variable; // Name of internal Gdb variable if created qint32 source; // Originated from dumper or symbol evaluation? (CDB only) };