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

Debugger: Remove most remaining occurrences of WatchData

Browse Source 
... in WatchHandler and DebuggerEngine interface.
Adjust using code.

Change-Id: I6371f3e96ba46a783e23a5767cdde24a10d3fce7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
hjk
2015-03-19 12:42:53 +01:00
parent b08e5a9bc3
commit b3f88df41d
28 changed files with 468 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ WatchData::WatchData() :
bitpos(0),
bitsize(0),
elided(0),
hasChildren(false),
wantsChildren(false),
valueEnabled(true),
valueEditable(true),
error(false),
@@ -150,7 +150,7 @@ bool WatchData::isEqual(const WatchData &other) const
&& address == other.address
&& size == other.size
&& elided == other.elided
&& hasChildren == other.hasChildren
&& wantsChildren == other.wantsChildren
&& valueEnabled == other.valueEnabled
&& valueEditable == other.valueEditable
&& error == other.error;
@@ -177,7 +177,7 @@ void WatchData::setError(const QString &msg)
{
setAllUnneeded();
value = msg;
setHasChildren(false);
wantsChildren = false;
valueEnabled = false;
valueEditable = false;
error = true;
@@ -188,7 +188,7 @@ void WatchData::setValue(const QString &value0)
value = value0;
if (value == QLatin1String("{...}")) {
value.clear();
hasChildren = true; // at least one...
wantsChildren = true; // at least one...
}
// strip off quoted characters for chars.
if (value.endsWith(QLatin1Char('\'')) && type.endsWith("char")) {
@@ -334,7 +334,7 @@ QString WatchData::toString() const
str << "type=\"" << type << doubleQuoteComma;
str << "hasChildren=\"" << (hasChildren ? "true" : "false") << doubleQuoteComma;
str << "wantsChildren=\"" << (wantsChildren ? "true" : "false") << doubleQuoteComma;
if (isChildrenNeeded())
str << "children=<needed>,";
@@ -604,10 +604,6 @@ void parseChildrenData(const WatchData &data0, const GdbMi &item,
mi = item["editformat"];
data.editformat = mi.toInt();
mi = item["typeformats"];
if (mi.isValid())
data.typeFormats = QString::fromUtf8(mi.data());
mi = item["valueelided"];
if (mi.isValid())
data.elided = mi.toInt();