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

debugger: move code around

Browse Source
This commit is contained in:
hjk
2009-07-23 11:18:21 +02:00
parent 45d2fd0797
commit 97afa6f7b0
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3032,13 +3032,19 @@ void GdbEngine::updateSubItem(const WatchData &data0)
qDebug() << "IT'S A POINTER";
#endif
#if 1
insertData(data.pointerChildPlaceHolder());
data.setChildrenUnneeded();
insertData(data);
WatchData data1;
data1.iname = data.iname + QLatin1String(".*");
data1.name = QLatin1Char('*') + data.name;
data1.exp = QLatin1String("(*(") + data.exp + QLatin1String("))");
data1.type = stripPointerType(data.type);
data1.setValueNeeded();
insertData(data1);
#else
// Try automatic dereferentiation
data.exp = "*(" + data.exp + ")";
data.type = data.type + "."; // FIXME: fragile HACK to avoid recursion
data.exp = _("*(") + data.exp + _(")");
data.type = data.type + _("."); // FIXME: fragile HACK to avoid recursion
insertData(data);
#endif
return;

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

@@ -198,17 +198,6 @@ void WatchData::setAddress(const QString &str)
addr = str;
}
WatchData WatchData::pointerChildPlaceHolder() const
{
WatchData data1;
data1.iname = iname + QLatin1String(".*");
data1.name = QLatin1Char('*') + name;
data1.exp = QLatin1String("(*(") + exp + QLatin1String("))");
data1.type = stripPointerType(type);
data1.setValueNeeded();
return data1;
}
QString WatchData::toString() const
{
const char *doubleQuoteComma = "\",";

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

@@ -102,8 +102,6 @@ public:
void setHasChildren(bool c) { hasChildren = c; setHasChildrenUnneeded();
if (!c) setChildrenUnneeded(); }
WatchData pointerChildPlaceHolder() const;
QString toString() const;
QString toToolTip() const;
bool isLocal() const { return iname.startsWith(QLatin1String("local.")); }