diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2018-06-29 13:20:59 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-06-29 13:41:56 +0000 |
commit | be7109d73203b65b48f19d2eeb2561c3eb619101 (patch) | |
tree | 5959c6884507d78865f56d483771430619b281a0 /src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp | |
parent | 88438a0e7961a622309add1c3805b1c239b6b9d3 (diff) |
CMake: Move code around a bit
Change-Id: I6129ee26ddd6ef2af713ad249dc884e63c1d5d6e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp b/src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp index 2eb93fda00..b116748fb0 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<CMakeTool *> autoDetectCMakeTools() return found; } +// -------------------------------------------------------------------- +// CMakeToolManager: +// -------------------------------------------------------------------- + CMakeToolManager *CMakeToolManager::m_instance = nullptr; CMakeToolManager::CMakeToolManager(QObject *parent) : QObject(parent) |