Commit b00698e2 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/3.6'

Change-Id: I145c4413ab17aa6a91ae7c6b9df44cd3f95f6951
parents 3d71680d 128995b2
......@@ -631,14 +631,10 @@ void TestTreeModel::processChildren(QModelIndex &parentIndex, const TestTreeItem
// handle data tags - just remove old and add them
if (modifiedChild->childCount() || toBeModifiedChild->childCount()) {
beginRemoveRows(child, 0, toBeModifiedChild->childCount());
toBeModifiedChild->removeChildren();
endRemoveRows();
const int count = modifiedChild->childCount();
beginInsertRows(child, 0, count);
for (int childRow = 0; childRow < count; ++childRow)
toBeModifiedChild->appendChild(new TestTreeItem(*modifiedChild->childItem(childRow)));
endInsertRows();
}
if (checkStates.contains(toBeModifiedChild->name())) {
......
......@@ -177,15 +177,14 @@ bool TestDataFunctionVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
{
if (ast->declarator) {
CPlusPlus::DeclaratorIdAST *id = ast->declarator->core_declarator->asDeclaratorId();
if (!id)
if (!id || !ast->symbol || ast->symbol->argumentCount() != 0)
return false;
const QString prettyName = m_overview.prettyName(id->name->name);
CPlusPlus::LookupContext lc;
const QString prettyName = m_overview.prettyName(lc.fullyQualifiedName(ast->symbol));
// do not handle functions that aren't real test data functions
if (!prettyName.endsWith(QLatin1String("_data")) || !ast->symbol
|| ast->symbol->argumentCount() != 0) {
if (!prettyName.endsWith(QLatin1String("_data")))
return false;
}
m_currentFunction = prettyName.left(prettyName.size() - 5);
m_currentTags.clear();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment