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

debugger: fix collapse/uncollapse bug in locals view

Browse Source 
(cherry picked from commit 64daf410dc)
This commit is contained in:
hjk
2009-08-26 17:29:22 +02:00
committed by con
parent 91c9e66731
commit dfebb2d28d
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,6 +203,7 @@ QString WatchData::toString() const
const char *doubleQuoteComma = "\","; const char *doubleQuoteComma = "\",";
QString res; QString res;
QTextStream str(&res); QTextStream str(&res);
str << QLatin1Char('{');
if (!iname.isEmpty()) if (!iname.isEmpty())
str << "iname=\"" << iname << doubleQuoteComma; str << "iname=\"" << iname << doubleQuoteComma;
if (!addr.isEmpty()) if (!addr.isEmpty())
@@ -855,6 +856,22 @@ void WatchModel::insertBulkData(const QList<WatchData> &list)
typedef QMap<IName, WatchData>::iterator Iterator; typedef QMap<IName, WatchData>::iterator Iterator;
foreach (const WatchItem &data, list) foreach (const WatchItem &data, list)
newList[data.iname] = data; newList[data.iname] = data;
if (newList.size() != list.size()) {
qDebug() << "LIST: ";
foreach (const WatchItem &data, list)
qDebug() << data.toString();
qDebug() << "NEW LIST: ";
foreach (const WatchItem &data, newList.values())
qDebug() << data.toString();
qDebug() << "P->CHILDREN: ";
foreach (const WatchItem *item, parent->children)
qDebug() << item->toString();
qDebug()
<< "P->CHILDREN.SIZE: " << parent->children.size()
<< "NEWLIST SIZE: " << newList.size()
<< "LIST SIZE: " << list.size();
}
QTC_ASSERT(newList.size() == list.size(), return);
foreach (WatchItem *oldItem, parent->children) { foreach (WatchItem *oldItem, parent->children) {
Iterator it = newList.find(oldItem->iname); Iterator it = newList.find(oldItem->iname);
@@ -871,15 +888,7 @@ void WatchModel::insertBulkData(const QList<WatchData> &list)
// overwrite existing items // overwrite existing items
Iterator it = newList.begin(); Iterator it = newList.begin();
int oldCount = newList.size() - list.size(); const int oldCount = parent->children.size();
if (oldCount != parent->children.size())
qDebug() //<< "LIST:" << list.keys()
<< "NEWLIST: " << newList.keys()
<< "OLD COUNT: " << oldCount
<< "P->CHILDREN.SIZE: " << parent->children.size()
<< "NEWLIST SIZE: " << newList.size()
<< "LIST SIZE: " << list.size();
QTC_ASSERT(oldCount == parent->children.size(), return);
for (int i = 0; i < oldCount; ++i, ++it) for (int i = 0; i < oldCount; ++i, ++it)
parent->children[i]->setData(*it); parent->children[i]->setData(*it);
QModelIndex idx = watchIndex(parent); QModelIndex idx = watchIndex(parent);