feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Move code around a bit

Browse Source 
Change-Id: I6129ee26ddd6ef2af713ad249dc884e63c1d5d6e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-06-29 13:20:59 +02:00
parent 88438a0e79
commit be7109d732
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -42,11 +42,9 @@ using namespace ProjectExplorer;
namespace CMakeProjectManager { namespace CMakeProjectManager {
const char CMAKETOOL_COUNT_KEY[] = "CMakeTools.Count"; // --------------------------------------------------------------------
const char CMAKETOOL_DEFAULT_KEY[] = "CMakeTools.Default"; // CMakeToolManagerPrivate:
const char CMAKETOOL_DATA_KEY[] = "CMakeTools."; // --------------------------------------------------------------------
const char CMAKETOOL_FILE_VERSION_KEY[] = "Version";
const char CMAKETOOL_FILENAME[] = "/cmaketools.xml";
class CMakeToolManagerPrivate class CMakeToolManagerPrivate
{ {
@@ -57,6 +55,16 @@ public:
}; };
static CMakeToolManagerPrivate *d = nullptr; 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() static FileName userSettingsFileName()
{ {
return FileName::fromString(ICore::userResourcePath() + CMAKETOOL_FILENAME); return FileName::fromString(ICore::userResourcePath() + CMAKETOOL_FILENAME);
@@ -182,6 +190,10 @@ static QList<CMakeTool *> autoDetectCMakeTools()
return found; return found;
} }
// --------------------------------------------------------------------
// CMakeToolManager:
// --------------------------------------------------------------------
CMakeToolManager *CMakeToolManager::m_instance = nullptr; CMakeToolManager *CMakeToolManager::m_instance = nullptr;
CMakeToolManager::CMakeToolManager(QObject *parent) : QObject(parent) CMakeToolManager::CMakeToolManager(QObject *parent) : QObject(parent)