From 7a135ac8a24a8fa5a75528f4d5d83c3a545cd8bc Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 6 Oct 2009 17:22:52 +0200
Subject: [PATCH] Search for possible forward classes.
---
src/plugins/cpptools/cppfindreferences.cpp | 28 +++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 375f322625e..6d9b9f8d0e6 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -164,12 +164,20 @@ protected:
if (! symbol)
return false;
- else if (symbol == _declSymbol)
+ else if (symbol == _declSymbol) {
return true;
- else if (symbol->line() == _declSymbol->line() && symbol->column() == _declSymbol->column()) {
+ } else if (symbol->line() == _declSymbol->line() && symbol->column() == _declSymbol->column()) {
if (! qstrcmp(symbol->fileName(), _declSymbol->fileName()))
return true;
+
+ } else if (symbol->isForwardClassDeclaration() && (_declSymbol->isClass() ||
+ _declSymbol->isForwardClassDeclaration())) {
+ return true;
+
+ } else if (_declSymbol->isForwardClassDeclaration() && (symbol->isClass() ||
+ symbol->isForwardClassDeclaration())) {
+ return true;
}
return false;
@@ -467,7 +475,21 @@ static void find_helper(QFutureInterface<Utils::FileSearchResult> &future,
const QString sourceFile = QString::fromUtf8(symbol->fileName(), symbol->fileNameLength());
QStringList files(sourceFile);
- files += snapshot.dependsOn(sourceFile);
+
+ if (symbol->isClass() || symbol->isForwardClassDeclaration()) {
+ foreach (const Document::Ptr &doc, snapshot) {
+ if (doc->fileName() == sourceFile)
+ continue;
+
+ Control *control = doc->control();
+
+ if (control->findIdentifier(symbolId->chars(), symbolId->size()))
+ files.append(doc->fileName());
+ }
+ } else {
+ files += snapshot.dependsOn(sourceFile);
+ }
+
qDebug() << "done in:" << tm.elapsed() << "number of files to parse:" << files.size();
future.setProgressRange(0, files.size());
--
GitLab