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

Debugger: Simplify calls to parseChildrenData

Browse Source 
Having access to the expanded inames doesn't make a difference.

Change-Id: Ic833f647c2c135f213dd621e28a9be98809e0b04
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-01-29 13:25:35 +01:00
parent ec7062d08f
commit 1eb507afbd
8 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -594,21 +594,16 @@ void decodeArrayData(std::function<void(const WatchData &)> itemHandler, const W
}
}
void parseChildrenData(const QSet<QByteArray> &expandedINames,
const WatchData &data0, const GdbMi &item,
void parseChildrenData(const WatchData &data0, const GdbMi &item,
std::function<void(const WatchData &)> itemHandler,
std::function<void(const QSet<QByteArray> &, const WatchData &, const GdbMi &)> childHandler,
std::function<void(const WatchData &, const GdbMi &)> childHandler,
std::function<void(const WatchData &childTemplate, const QByteArray &encodedData, int encoding)> arrayDecoder)
{
//qDebug() << "HANDLE CHILDREN: " << data0.toString() << item.toString();
WatchData data = data0;
bool isExpanded = expandedINames.contains(data.iname);
if (!isExpanded)
data.setChildrenUnneeded();
data.setChildrenUnneeded();
GdbMi children = item["children"];
if (children.isValid() || !isExpanded)
data.setChildrenUnneeded();
data.updateType(item["type"]);
GdbMi mi = item["editvalue"];
@@ -698,28 +693,26 @@ void parseChildrenData(const QSet<QByteArray> &expandedINames,
int encoding = child["keyencoded"].toInt();
data1.name = decodeData(key, encoding);
}
childHandler(expandedINames, data1, child);
childHandler(data1, child);
}
}
}
void parseWatchData(const QSet<QByteArray> &expandedINames,
const WatchData &data0, const GdbMi &input,
void parseWatchData(const WatchData &data0, const GdbMi &input,
QList<WatchData> *list)
{
auto itemHandler = [list](const WatchData &data) {
list->append(data);
};
auto childHandler = [list](const QSet<QByteArray> &expandedINames,
const WatchData &innerData, const GdbMi &innerInput) {
parseWatchData(expandedINames, innerData, innerInput, list);
auto childHandler = [list](const WatchData &innerData, const GdbMi &innerInput) {
parseWatchData(innerData, innerInput, list);
};
auto arrayDecoder = [itemHandler](const WatchData &childTemplate,
const QByteArray &encodedData, int encoding) {
decodeArrayData(itemHandler, childTemplate, encodedData, encoding);
};
parseChildrenData(expandedINames, data0, input, itemHandler, childHandler, arrayDecoder);
parseChildrenData(data0, input, itemHandler, childHandler, arrayDecoder);
}
} // namespace Internal