From 0d84603c41cb1e2b9afead49bd7777c856da377f Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Thu, 6 Mar 2014 14:42:01 -0300
Subject: [PATCH] CodeModel(s): Unify name/values of accessed environment
 variables

Format: QTC_*=(1|0).

Now it's easier to change them in the Run Configuration of Qt Creator.

Change-Id: Ifc45cecb89b33a31942b4c3e2d03851a1d72d0bf
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
---
 src/plugins/clangcodemodel/clangcompletion.cpp  | 2 +-
 src/plugins/clangcodemodel/clangutils.cpp       | 2 +-
 src/plugins/clangcodemodel/cppcreatemarkers.cpp | 2 +-
 src/plugins/clangcodemodel/unit.cpp             | 2 +-
 src/plugins/cpptools/builtinindexingsupport.cpp | 4 +++-
 src/plugins/cpptools/cppmodelmanager.cpp        | 6 ++++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index c5974aea708..f1b309239a8 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -60,7 +60,7 @@
 #include <QTextCursor>
 #include <QTextDocument>
 
-static const bool DebugTiming = !qgetenv("QTC_CLANG_VERBOSE").isEmpty();
+static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1";
 
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 79348e44bd8..9a8dede302e 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -45,7 +45,7 @@ using namespace ClangCodeModel::Internal;
 using namespace Core;
 using namespace CppTools;
 
-static const bool BeVerbose = !qgetenv("QTC_CLANG_VERBOSE").isEmpty();
+static const bool BeVerbose = qgetenv("QTC_CLANG_VERBOSE") == "1";
 
 namespace ClangCodeModel {
 namespace Utils {
diff --git a/src/plugins/clangcodemodel/cppcreatemarkers.cpp b/src/plugins/clangcodemodel/cppcreatemarkers.cpp
index 5cbac36dda9..5171101ceb1 100644
--- a/src/plugins/clangcodemodel/cppcreatemarkers.cpp
+++ b/src/plugins/clangcodemodel/cppcreatemarkers.cpp
@@ -41,7 +41,7 @@
 
 #include <QDebug>
 
-static const bool DebugTiming = !qgetenv("QTC_CLANG_VERBOSE").isEmpty();
+static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1";
 
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
diff --git a/src/plugins/clangcodemodel/unit.cpp b/src/plugins/clangcodemodel/unit.cpp
index f9423465b7a..fe986014423 100644
--- a/src/plugins/clangcodemodel/unit.cpp
+++ b/src/plugins/clangcodemodel/unit.cpp
@@ -47,7 +47,7 @@ static QBasicAtomicInt unitDataCount = Q_BASIC_ATOMIC_INITIALIZER(0);
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
 
-static const int DisplayDiagnostics = qgetenv("QTC_CLANG_VERBOSE").isEmpty() ? 0 : 1;
+static const int DisplayDiagnostics = (qgetenv("QTC_CLANG_VERBOSE") == "1") ? 1 : 0;
 
 Unit::Unit()
     : m_index(0)
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 51c3bde5563..99f3974e53e 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -16,6 +16,8 @@
 using namespace CppTools;
 using namespace CppTools::Internal;
 
+static const bool DumpFileNameWhileParsing = qgetenv("QTC_DUMP_FILENAME_WHILE_PARSING") == "1";
+
 namespace {
 
 static void parse(QFutureInterface<void> &future,
@@ -171,7 +173,7 @@ BuiltinIndexingSupport::BuiltinIndexingSupport()
     : m_revision(0)
 {
     m_synchronizer.setCancelOnWait(true);
-    m_dumpFileNameWhileParsing = !qgetenv("QTCREATOR_DUMP_FILENAME_WHILE_PARSING").isNull();
+    m_dumpFileNameWhileParsing = DumpFileNameWhileParsing;
 }
 
 BuiltinIndexingSupport::~BuiltinIndexingSupport()
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 640e8bfa075..1312a2ab31d 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -60,6 +60,8 @@
 #include <sstream>
 #endif
 
+static const bool DumpProjectInfo = qgetenv("QTC_DUMP_PROJECT_INFO") == "1";
+
 namespace CppTools {
 
 uint qHash(const ProjectPart &p)
@@ -245,7 +247,7 @@ CppModelManager::CppModelManager(QObject *parent)
             this, SIGNAL(globalSnapshotChanged()));
 
     m_findReferences = new CppFindReferences(this);
-    m_indexerEnabled = qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull();
+    m_indexerEnabled = qgetenv("QTC_NO_CODE_INDEXER") != "1";
 
     m_dirty = true;
 
@@ -782,7 +784,7 @@ QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo &newProjectIn
     } // Mutex scope
 
     // If requested, dump everything we got
-    if (!qgetenv("QTCREATOR_DUMP_PROJECT_INFO").isEmpty())
+    if (DumpProjectInfo)
         dumpModelManagerConfiguration();
 
     // Remove files from snapshot that are not reachable any more