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

Fix display of templates in outline.

Browse Source 
Change-Id: I8b099c8234fac55ef0de17b014c89fbe02534bf4
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Francois Ferrand
2012-06-15 11:28:18 +02:00
committed by Leandro Melo
parent a68352f013
commit 9c7b96c663
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/cplusplus/OverviewModel.cpp
View File

@@ -76,6 +76,10 @@ QModelIndex OverviewModel::index(int row, int column, const QModelIndex &parent)
Symbol *parentSymbol = static_cast<Symbol *>(parent.internalPointer()); Symbol *parentSymbol = static_cast<Symbol *>(parent.internalPointer());
Q_ASSERT(parentSymbol); Q_ASSERT(parentSymbol);
if (Template *t = parentSymbol->asTemplate())
if (Symbol *templateParentSymbol = t->declaration())
parentSymbol = templateParentSymbol;
Scope *scope = parentSymbol->asScope(); Scope *scope = parentSymbol->asScope();
Q_ASSERT(scope != 0); Q_ASSERT(scope != 0);
return createIndex(row, 0, scope->memberAt(row)); return createIndex(row, 0, scope->memberAt(row));
@@ -89,6 +93,8 @@ QModelIndex OverviewModel::parent(const QModelIndex &child) const
return QModelIndex(); return QModelIndex();
if (Scope *scope = symbol->enclosingScope()) { if (Scope *scope = symbol->enclosingScope()) {
if (scope->isTemplate() && scope->enclosingScope())
scope = scope->enclosingScope();
if (scope->enclosingScope()) { if (scope->enclosingScope()) {
QModelIndex index; QModelIndex index;
if (scope->enclosingScope() && scope->enclosingScope()->enclosingScope()) // the parent doesn't have a parent if (scope->enclosingScope() && scope->enclosingScope()->enclosingScope()) // the parent doesn't have a parent
@@ -113,6 +119,10 @@ int OverviewModel::rowCount(const QModelIndex &parent) const
Symbol *parentSymbol = static_cast<Symbol *>(parent.internalPointer()); Symbol *parentSymbol = static_cast<Symbol *>(parent.internalPointer());
Q_ASSERT(parentSymbol); Q_ASSERT(parentSymbol);
if (Template *t = parentSymbol->asTemplate())
if (Symbol *templateParentSymbol = t->declaration())
parentSymbol = templateParentSymbol;
if (Scope *parentScope = parentSymbol->asScope()) { if (Scope *parentScope = parentSymbol->asScope()) {
if (!parentScope->isFunction() && !parentScope->isObjCMethod()) { if (!parentScope->isFunction() && !parentScope->isObjCMethod()) {
return parentScope->memberCount(); return parentScope->memberCount();
@@ -168,6 +178,14 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const
} }
if (symbol->isObjCPropertyDeclaration()) if (symbol->isObjCPropertyDeclaration())
name = QLatin1String("@property ") + name; name = QLatin1String("@property ") + name;
if (Template *t = symbol->asTemplate())
if (Symbol *templateDeclaration = t->declaration()) {
QStringList parameters;
for (unsigned i = 0; i < t->templateParameterCount(); ++i)
parameters.append(_overview.prettyName(t->templateParameterAt(i)->name()));
name += QLatin1Char('<') + parameters.join(QLatin1String(", ")) + QLatin1Char('>');
symbol = templateDeclaration;
}
if (symbol->isObjCMethod()) { if (symbol->isObjCMethod()) {
ObjCMethod *method = symbol->asObjCMethod(); ObjCMethod *method = symbol->asObjCMethod();
if (method->isStatic()) if (method->isStatic())