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

C++: Make 'follow symbol' work with forward declared classes.

Browse Source 
If it encounters a forward declaration, it tries to find the class
declaration globally now.

Task-number: QTCREATORBUG-20
This commit is contained in:
Christian Kamm
2010-06-16 15:35:34 +02:00
parent 2deae8c84a
commit e1a0f5abef
4 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/cplusplus/CppDocument.cpp
View File

@@ -793,3 +793,26 @@ Symbol *Snapshot::findMatchingDefinition(Symbol *symbol) const
return 0;
}
Class *Snapshot::findMatchingClassDeclaration(Symbol *declaration) const
{
if (! declaration->identifier())
return 0;
foreach (Document::Ptr doc, *this) {
if (! doc->control()->findIdentifier(declaration->identifier()->chars(),
declaration->identifier()->size()))
continue;
LookupContext context(doc, *this);
ClassOrNamespace *type = context.lookupType(declaration);
if (!type || type->symbols().count() != 1)
continue;
if (Class *c = type->symbols().first()->asClass())
return c;
}
return 0;
}

1
src/libs/cplusplus/CppDocument.h
View File

@@ -372,6 +372,7 @@ public:
const QString &fileName) const;
Symbol *findMatchingDefinition(Symbol *symbol) const;
Class *findMatchingClassDeclaration(Symbol *symbol) const;
private:
void simplified_helper(Document::Ptr doc, Snapshot *snapshot) const;

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

@@ -64,7 +64,8 @@ static void fullyQualifiedName_helper(Symbol *symbol, QList<const Name *> *names
names->append(symbol->name());
}
} else if (symbol->isObjCClass() || symbol->isObjCBaseClass() || symbol->isObjCProtocol()
|| symbol->isObjCForwardClassDeclaration() || symbol->isObjCForwardProtocolDeclaration()) {
|| symbol->isObjCForwardClassDeclaration() || symbol->isObjCForwardProtocolDeclaration()
|| symbol->isForwardClassDeclaration()) {
if (symbol->name())
names->append(symbol->name());
} else if (symbol->isFunction()) {