From dea74862d3d0cf7b4624bbb39069bb0fd3435644 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 17 Jan 2011 14:41:19 +0100
Subject: Fixed the line retreival for find-usages.

Instead of using the pre-processed source, the original one is used.
This makes a difference when a macro is used in the line, where the pre-
processed source would have a "#gen true" token.

Task-number: QTCREATORBUG-3345
---
 src/plugins/cpptools/cppfindreferences.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/plugins/cpptools/cppfindreferences.cpp')

diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 71efe5cf26..479f55c354 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -115,11 +115,12 @@ public:
 
         Document::Ptr doc;
         QByteArray source;
+        const QString unpreprocessedSource = getSource(fileName, workingCopy);
 
         if (symbolDocument && fileName == symbolDocument->fileName())
             doc = symbolDocument;
         else {
-            source = snapshot.preprocessedCode(getSource(fileName, workingCopy), fileName);
+            source = snapshot.preprocessedCode(unpreprocessedSource, fileName);
             doc = snapshot.documentFromSource(source, fileName);
             doc->tokenize();
         }
@@ -129,7 +130,7 @@ public:
             if (doc != symbolDocument)
                 doc->check();
 
-            FindUsages process(doc, snapshot);
+            FindUsages process(unpreprocessedSource.toUtf8(), doc, snapshot);
             process(symbol);
 
             usages = process.usages();
-- 
cgit v1.2.1