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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Conflicts:
	src/plugins/debugger/watchhandler.cpp

Change-Id: If759b6260dfa008738d3a0ce543eb0eead8a8bba
This commit is contained in:
Eike Ziller
2023-02-27 09:48:12 +01:00
parent 5169469911 ca8d4082ec
commit 380f7622de
73 changed files with 1388 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,10 @@
namespace Debugger::Internal {
const QStringView inameLocal = u"local.";
const QStringView inameWatch = u"watch.";
const QStringView inameInspect = u"inspect.";
bool isPointerType(const QStringView type)
{
return type.endsWith('*') || type.endsWith(u"* const");
@@ -316,7 +320,7 @@ void WatchItem::parseHelper(const GdbMi &input, bool maySort)
if (mi.isValid()) {
address = mi.toAddress();
if (exp.isEmpty()) {
if (iname.startsWith("local.") && iname.count('.') == 1)
if (iname.startsWith(inameLocal) && iname.count('.') == 1)
// Solve one common case of adding 'class' in
// *(class X*)0xdeadbeef for gdb.
exp = name;
@@ -519,7 +523,7 @@ bool WatchItem::isLocal() const
if (arrayIndex >= 0)
if (const WatchItem *p = parent())
return p->isLocal();
return iname.startsWith("local.");
return iname.startsWith(inameLocal);
}
bool WatchItem::isWatcher() const
@@ -527,7 +531,7 @@ bool WatchItem::isWatcher() const
if (arrayIndex >= 0)
if (const WatchItem *p = parent())
return p->isWatcher();
return iname.startsWith("watch.");
return iname.startsWith(inameWatch);
}
bool WatchItem::isInspect() const
@@ -535,7 +539,7 @@ bool WatchItem::isInspect() const
if (arrayIndex >= 0)
if (const WatchItem *p = parent())
return p->isInspect();
return iname.startsWith("inspect.");
return iname.startsWith(inameInspect);
}
QString WatchItem::internalName() const