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

Merge branch '1.3'

Browse Source
This commit is contained in:
Thorbjørn Lindeijer
2010-01-06 14:45:35 +01:00
parent 2ab738cd7a a3fd049ec8
commit 97eabc2916
4 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/cplusplus/LookupContext.cpp
View File

@@ -361,8 +361,10 @@ QList<Scope *> LookupContext::visibleScopes(const LookupItem &result) const
QList<Scope *> LookupContext::visibleScopes(Symbol *symbol) const
{
QList<Scope *> scopes;
for (Scope *scope = symbol->scope(); scope; scope = scope->enclosingScope())
scopes.append(scope);
if (symbol) {
for (Scope *scope = symbol->scope(); scope; scope = scope->enclosingScope())
scopes.append(scope);
}
scopes += visibleScopes();
scopes = expand(scopes);
return scopes;

2
src/libs/cplusplus/NamePrettyPrinter.cpp
View File

@@ -90,6 +90,8 @@ void NamePrettyPrinter::visit(const TemplateNameId *name)
else
_name += arg;
}
if (! _name.isEmpty() && _name.at(_name.length() - 1) == '>')
_name += QLatin1Char(' ');
_name += QLatin1Char('>');
}