feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove two more unneeded WatchData members

Browse Source 
Change-Id: If6d2fb4366a5ab2b6f189a4037efb04943a19c2e
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-03-25 14:04:37 +01:00
parent 23e435ea5e
commit c8b261fc8a
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/watchdata.cpp
View File

@@ -131,7 +131,6 @@ WatchData::WatchData() :
wantsChildren(false), wantsChildren(false),
valueEnabled(true), valueEnabled(true),
valueEditable(true), valueEditable(true),
error(false),
sortId(0), sortId(0),
source(0) source(0)
{ {
@@ -146,14 +145,12 @@ bool WatchData::isEqual(const WatchData &other) const
&& editvalue == other.editvalue && editvalue == other.editvalue
&& type == other.type && type == other.type
&& displayedType == other.displayedType && displayedType == other.displayedType
&& variable == other.variable
&& address == other.address && address == other.address
&& size == other.size && size == other.size
&& elided == other.elided && elided == other.elided
&& wantsChildren == other.wantsChildren && wantsChildren == other.wantsChildren
&& valueEnabled == other.valueEnabled && valueEnabled == other.valueEnabled
&& valueEditable == other.valueEditable && valueEditable == other.valueEditable;
&& error == other.error;
} }
bool WatchData::isAncestorOf(const QByteArray &childIName) const bool WatchData::isAncestorOf(const QByteArray &childIName) const
@@ -180,7 +177,6 @@ void WatchData::setError(const QString &msg)
wantsChildren = false; wantsChildren = false;
valueEnabled = false; valueEnabled = false;
valueEditable = false; valueEditable = false;
error = true;
} }
void WatchData::setValue(const QString &value0) void WatchData::setValue(const QString &value0)
@@ -299,8 +295,6 @@ QString WatchData::toString() const
str << "sortId=\"" << sortId << doubleQuoteComma; str << "sortId=\"" << sortId << doubleQuoteComma;
if (!name.isEmpty() && name != QLatin1String(iname)) if (!name.isEmpty() && name != QLatin1String(iname))
str << "name=\"" << name << doubleQuoteComma; str << "name=\"" << name << doubleQuoteComma;
if (error)
str << "error,";
if (address) { if (address) {
str.setIntegerBase(16); str.setIntegerBase(16);
str << "addr=\"0x" << address << doubleQuoteComma; str << "addr=\"0x" << address << doubleQuoteComma;
@@ -314,9 +308,6 @@ QString WatchData::toString() const
if (!exp.isEmpty()) if (!exp.isEmpty())
str << "exp=\"" << exp << doubleQuoteComma; str << "exp=\"" << exp << doubleQuoteComma;
if (!variable.isEmpty())
str << "variable=\"" << variable << doubleQuoteComma;
if (isValueNeeded()) if (isValueNeeded())
str << "value=<needed>,"; str << "value=<needed>,";
if (!value.isEmpty()) if (!value.isEmpty())

2
src/plugins/debugger/watchdata.h
View File

@@ -125,14 +125,12 @@ public:
bool wantsChildren; bool wantsChildren;
bool valueEnabled; // Value will be enabled or not bool valueEnabled; // Value will be enabled or not
bool valueEditable; // Value will be editable bool valueEditable; // Value will be editable
bool error;
qint32 sortId; qint32 sortId;
Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler) Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler)
public: public:
// FIXME: this is engine specific data that should be mapped internally // 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) qint32 source; // Originated from dumper or symbol evaluation? (CDB only)
}; };