From be7109d73203b65b48f19d2eeb2561c3eb619101 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Jun 2018 13:20:59 +0200 Subject: [PATCH] CMake: Move code around a bit Change-Id: I6129ee26ddd6ef2af713ad249dc884e63c1d5d6e Reviewed-by: Eike Ziller --- .../cmakeprojectmanager/cmaketoolmanager.cpp | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp index 2eb93fda00a..b116748fb03 100644 --- a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp @@ -42,11 +42,9 @@ using namespace ProjectExplorer; namespace CMakeProjectManager { -const char CMAKETOOL_COUNT_KEY[] = "CMakeTools.Count"; -const char CMAKETOOL_DEFAULT_KEY[] = "CMakeTools.Default"; -const char CMAKETOOL_DATA_KEY[] = "CMakeTools."; -const char CMAKETOOL_FILE_VERSION_KEY[] = "Version"; -const char CMAKETOOL_FILENAME[] = "/cmaketools.xml"; +// -------------------------------------------------------------------- +// CMakeToolManagerPrivate: +// -------------------------------------------------------------------- class CMakeToolManagerPrivate { @@ -57,6 +55,16 @@ public: }; static CMakeToolManagerPrivate *d = nullptr; +// -------------------------------------------------------------------- +// Helper: +// -------------------------------------------------------------------- + +const char CMAKETOOL_COUNT_KEY[] = "CMakeTools.Count"; +const char CMAKETOOL_DEFAULT_KEY[] = "CMakeTools.Default"; +const char CMAKETOOL_DATA_KEY[] = "CMakeTools."; +const char CMAKETOOL_FILE_VERSION_KEY[] = "Version"; +const char CMAKETOOL_FILENAME[] = "/cmaketools.xml"; + static FileName userSettingsFileName() { return FileName::fromString(ICore::userResourcePath() + CMAKETOOL_FILENAME); @@ -182,6 +190,10 @@ static QList autoDetectCMakeTools() return found; } +// -------------------------------------------------------------------- +// CMakeToolManager: +// -------------------------------------------------------------------- + CMakeToolManager *CMakeToolManager::m_instance = nullptr; CMakeToolManager::CMakeToolManager(QObject *parent) : QObject(parent)