C++: Remove hard-coded configuration file name.

Change-Id: Ibe4cc69eafd14dab7707862b1068ce1e21b1d8e0
Reviewed-by: Nikolai Kosjar <[email protected]>

3 files changed, 9 insertions, 5 deletions

diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index b95ea7493fb..1eff7ff3b98 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -30,13 +30,12 @@
 #include "FastPreprocessor.h"
 #include <Literals.h>
 #include <TranslationUnit.h>
-#include <QDebug>
 
 using namespace CPlusPlus;
 
 FastPreprocessor::FastPreprocessor(const Snapshot &snapshot)
-    : _snapshot(snapshot),
-      _preproc(this, &_env)
+    : _snapshot(snapshot)
+    , _preproc(this, &_env)
 { }
 
 QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QString &source)
@@ -49,7 +48,7 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QString &source)
     if (Document::Ptr doc = _snapshot.document(fileName)) {
         _merged.insert(fileName);
 
-        mergeEnvironment(QLatin1String("<configuration>"));
+        mergeEnvironment(Preprocessor::configurationFileName);
         foreach (const Document::Include &i, doc->includes())
             mergeEnvironment(i.fileName());
     }
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 3564cc11c45..22f30d08e6d 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -589,6 +589,8 @@ void Preprocessor::State::popTokenBuffer()
         --m_tokenBufferDepth;
 }
 
+const QString Preprocessor::configurationFileName = QLatin1String("<configuration>");
+
 Preprocessor::Preprocessor(Client *client, Environment *env)
     : m_client(client)
     , m_env(env)
@@ -1751,7 +1753,7 @@ void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk)
 
             // the macro is a feature constraint(e.g. QT_NO_XXX)
             if (checkUndefined && macroName.startsWith("QT_NO_")) {
-                if (macro->fileName() == QLatin1String("<configuration>")) {
+                if (macro->fileName() == configurationFileName) {
                     // and it' defined in a pro file (e.g. DEFINES += QT_NO_QOBJECT)
 
                     value = false; // take the branch
diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index 98d7f90ff85..a86b2b4f0a5 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -75,6 +75,9 @@ class CPLUSPLUS_EXPORT Preprocessor
     typedef Internal::Value Value;
 
 public:
+    static const QString configurationFileName;
+
+public:
     Preprocessor(Client *client, Environment *env);
 
     QByteArray run(const QString &filename, const QString &source);