Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

1 files changed, 6 insertions, 10 deletions

diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 355f2bf61a..46177f1d51 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -332,19 +332,19 @@ static void find_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
     Identifier *symbolId = symbol->identifier();
     Q_ASSERT(symbolId != 0);
 
-    const QString fileName = QString::fromUtf8(symbol->fileName(), symbol->fileNameLength());
+    const QString sourceFile = QString::fromUtf8(symbol->fileName(), symbol->fileNameLength());
 
-    QStringList files(fileName);
-    files += snapshot.dependsOn(fileName);
+    QStringList files(sourceFile);
+    files += snapshot.dependsOn(sourceFile);
     qDebug() << "done in:" << tm.elapsed() << "number of files to parse:" << files.size();
 
     future.setProgressRange(0, files.size());
 
     for (int i = 0; i < files.size(); ++i) {
-        const QString &fn = files.at(i);
-        future.setProgressValueAndText(i, QFileInfo(fn).fileName());
+        const QString &fileName = files.at(i);
+        future.setProgressValueAndText(i, QFileInfo(fileName).fileName());
 
-        Document::Ptr previousDoc = snapshot.value(fn);
+        Document::Ptr previousDoc = snapshot.value(fileName);
         if (previousDoc) {
             Control *control = previousDoc->control();
             Identifier *id = control->findIdentifier(symbolId->chars(), symbolId->size());
@@ -352,10 +352,6 @@ static void find_helper(QFutureInterface<Core::Utils::FileSearchResult> &future,
                 continue; // skip this document, it's not using symbolId.
         }
 
-        QFile f(fn);
-        if (! f.open(QFile::ReadOnly))
-            continue;
-
         QByteArray source;
 
         if (wl.contains(fileName))