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

Revert "Enabled the use of Debugger-specific watch/locals models."

Browse Source 
This reverts commit abf5e3ddc3.
This commit is contained in:
hjk
2009-07-13 09:11:07 +02:00
parent d29bdf7126
commit ad46f1286f
29 changed files with 698 additions and 1799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/watchutils.cpp
View File

@@ -554,22 +554,19 @@ QList<WatchData> QtDumperResult::toWatchData(int source) const
}
wchild.setType(dchild.type.isEmpty() ? childType : dchild.type);
wchild.setAddress(dchild.address);
// Child overrides. Note that WatchData::setType sets
// childcount = 0 for some known types.
if (wchild.isHasChildrenNeeded()) {
const int effectiveChildChildCount = dchild.childCount == -1 ? childChildCount : dchild.childCount;
switch (effectiveChildChildCount) {
// Child overrides.
const int effectiveChildChildCount = dchild.childCount == -1 ? childChildCount : dchild.childCount;
switch (effectiveChildChildCount) {
case -1:
wchild.setChildrenNeeded();
wchild.setHasChildrenNeeded();
break;
wchild.setChildrenNeeded();
wchild.setHasChildrenNeeded();
break;
case 0:
wchild.setHasChildren(false);
break;
wchild.setHasChildren(false);
break;
default:
wchild.setHasChildren(true);
break;
}
wchild.setHasChildren(true);
break;
}
}
}