diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index 214a2fc183f..45929e522b1 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -52,16 +52,8 @@ static const char ANDROID_GDBSERVER_INFORMATION[] = "Android.GdbServer.Informati AndroidGdbServerKitInformation::AndroidGdbServerKitInformation() { -} - -Core::Id AndroidGdbServerKitInformation::dataId() const -{ - return Core::Id(ANDROID_GDBSERVER_INFORMATION); -} - -unsigned int AndroidGdbServerKitInformation::priority() const -{ - return 27999; // Just one less than Debugger! + setDataId(ANDROID_GDBSERVER_INFORMATION); + setPriority(27999); // Just one less than Debugger! } QVariant AndroidGdbServerKitInformation::defaultValue(ProjectExplorer::Kit *kit) const diff --git a/src/plugins/android/androidgdbserverkitinformation.h b/src/plugins/android/androidgdbserverkitinformation.h index f81ce85f90b..469cde707d5 100644 --- a/src/plugins/android/androidgdbserverkitinformation.h +++ b/src/plugins/android/androidgdbserverkitinformation.h @@ -69,10 +69,7 @@ class AndroidGdbServerKitInformation : public ProjectExplorer::KitInformation { Q_OBJECT public: - explicit AndroidGdbServerKitInformation(); - Core::Id dataId() const; - - unsigned int priority() const; // the higher the closer to the top. + AndroidGdbServerKitInformation(); QVariant defaultValue(ProjectExplorer::Kit *) const; diff --git a/src/plugins/debugger/debuggerkitconfigwidget.cpp b/src/plugins/debugger/debuggerkitconfigwidget.cpp index e6d64376737..db1fbf5de8b 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.cpp +++ b/src/plugins/debugger/debuggerkitconfigwidget.cpp @@ -229,17 +229,8 @@ void DebuggerItem::reinitializeFromFile() DebuggerKitInformation::DebuggerKitInformation() { setObjectName(QLatin1String("DebuggerKitInformation")); -} - -Core::Id DebuggerKitInformation::dataId() const -{ - static Core::Id id = Core::Id(DEBUGGER_INFORMATION); - return id; -} - -unsigned int DebuggerKitInformation::priority() const -{ - return 28000; + setDataId(DEBUGGER_INFORMATION); + setPriority(28000); } QVariant DebuggerKitInformation::defaultValue(Kit *k) const diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index 8e46c2d3610..c5d53c24b93 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -69,10 +69,6 @@ class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInform public: DebuggerKitInformation(); - Core::Id dataId() const; - - unsigned int priority() const; // the higher the closer to the top. - QVariant defaultValue(ProjectExplorer::Kit *k) const; QList validate(const ProjectExplorer::Kit *k) const diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 133749d5351..5c3e2f8a4d5 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -54,17 +54,8 @@ static const char SYSROOT_INFORMATION[] = "PE.Profile.SysRoot"; SysRootKitInformation::SysRootKitInformation() { setObjectName(QLatin1String("SysRootInformation")); -} - -Core::Id SysRootKitInformation::dataId() const -{ - static const Core::Id id(SYSROOT_INFORMATION); - return id; -} - -unsigned int SysRootKitInformation::priority() const -{ - return 31000; + setDataId(SYSROOT_INFORMATION); + setPriority(31000); } QVariant SysRootKitInformation::defaultValue(Kit *k) const @@ -127,21 +118,13 @@ static const char TOOLCHAIN_INFORMATION[] = "PE.Profile.ToolChain"; ToolChainKitInformation::ToolChainKitInformation() { setObjectName(QLatin1String("ToolChainInformation")); + setDataId(TOOLCHAIN_INFORMATION); + setPriority(30000); + connect(KitManager::instance(), SIGNAL(kitsLoaded()), this, SLOT(kitsWereLoaded())); } -Core::Id ToolChainKitInformation::dataId() const -{ - static const Core::Id id(TOOLCHAIN_INFORMATION); - return id; -} - -unsigned int ToolChainKitInformation::priority() const -{ - return 30000; -} - QVariant ToolChainKitInformation::defaultValue(Kit *k) const { Q_UNUSED(k); @@ -292,17 +275,8 @@ static const char DEVICETYPE_INFORMATION[] = "PE.Profile.DeviceType"; DeviceTypeKitInformation::DeviceTypeKitInformation() { setObjectName(QLatin1String("DeviceTypeInformation")); -} - -Core::Id DeviceTypeKitInformation::dataId() const -{ - static const Core::Id id(DEVICETYPE_INFORMATION); - return id; -} - -unsigned int DeviceTypeKitInformation::priority() const -{ - return 33000; + setDataId(DEVICETYPE_INFORMATION); + setPriority(33000); } QVariant DeviceTypeKitInformation::defaultValue(Kit *k) const @@ -363,21 +337,13 @@ static const char DEVICE_INFORMATION[] = "PE.Profile.Device"; DeviceKitInformation::DeviceKitInformation() { setObjectName(QLatin1String("DeviceInformation")); + setDataId(DEVICE_INFORMATION); + setPriority(32000); + connect(KitManager::instance(), SIGNAL(kitsLoaded()), this, SLOT(kitsWereLoaded())); } -Core::Id DeviceKitInformation::dataId() const -{ - static const Core::Id id(DEVICE_INFORMATION); - return id; -} - -unsigned int DeviceKitInformation::priority() const -{ - return 32000; -} - QVariant DeviceKitInformation::defaultValue(Kit *k) const { Core::Id type = DeviceTypeKitInformation::deviceTypeId(k); diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index 24fc6ad2143..8bcbb6f744b 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -53,9 +53,6 @@ class PROJECTEXPLORER_EXPORT SysRootKitInformation : public KitInformation public: SysRootKitInformation(); - Core::Id dataId() const; - unsigned int priority() const; - QVariant defaultValue(Kit *k) const; QList validate(const Kit *k) const; @@ -97,9 +94,6 @@ class PROJECTEXPLORER_EXPORT ToolChainKitInformation : public KitInformation public: ToolChainKitInformation(); - Core::Id dataId() const; - unsigned int priority() const; - QVariant defaultValue(Kit *k) const; QList validate(const Kit *k) const; @@ -154,9 +148,6 @@ class PROJECTEXPLORER_EXPORT DeviceTypeKitInformation : public KitInformation public: DeviceTypeKitInformation(); - Core::Id dataId() const; - unsigned int priority() const; - QVariant defaultValue(Kit *k) const; QList validate(const Kit *k) const; @@ -199,9 +190,6 @@ class PROJECTEXPLORER_EXPORT DeviceKitInformation : public KitInformation public: DeviceKitInformation(); - Core::Id dataId() const; - unsigned int priority() const; - QVariant defaultValue(Kit *k) const; QList validate(const Kit *k) const; diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index b787170becf..7daf3304ee9 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -70,9 +70,8 @@ public: typedef QPair Item; typedef QList ItemList; - virtual Core::Id dataId() const = 0; - - virtual unsigned int priority() const = 0; // the higher the closer to the top. + Core::Id dataId() const { return m_dataId; } + int priority() const { return m_priority; } virtual QVariant defaultValue(Kit *) const = 0; @@ -95,7 +94,13 @@ public: bool isSticky(const Kit *k) const; protected: + void setDataId(Core::Id id) { m_dataId = id; } + void setPriority(int priority) { m_priority = priority; } void notifyAboutUpdate(Kit *k); + +private: + Core::Id m_dataId; + int m_priority; // The higher the closer to the top. }; class PROJECTEXPLORER_EXPORT KitMatcher diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp index d06e8fbd0ea..0e5a337ab65 100644 --- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp +++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp @@ -45,17 +45,8 @@ const char MKSPEC_INFORMATION[] = "QtPM4.mkSpecInformation"; QmakeKitInformation::QmakeKitInformation() { setObjectName(QLatin1String("QmakeKitInformation")); -} - -Core::Id QmakeKitInformation::dataId() const -{ - static Core::Id id = Core::Id(Internal::MKSPEC_INFORMATION); - return id; -} - -unsigned int QmakeKitInformation::priority() const -{ - return 24000; + setDataId(Internal::MKSPEC_INFORMATION); + setPriority(24000); } QVariant QmakeKitInformation::defaultValue(ProjectExplorer::Kit *k) const diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.h b/src/plugins/qt4projectmanager/qmakekitinformation.h index ece8087fdfc..43c681d643a 100644 --- a/src/plugins/qt4projectmanager/qmakekitinformation.h +++ b/src/plugins/qt4projectmanager/qmakekitinformation.h @@ -43,10 +43,6 @@ class QT4PROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::Kit public: QmakeKitInformation(); - Core::Id dataId() const; - - unsigned int priority() const; // the higher the closer to the top. - QVariant defaultValue(ProjectExplorer::Kit *k) const; QList validate(const ProjectExplorer::Kit *k) const; diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 0509ecfa53e..ab0d6f09bf8 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -45,21 +45,13 @@ const char QT_INFORMATION[] = "QtSupport.QtInformation"; QtKitInformation::QtKitInformation() { setObjectName(QLatin1String("QtKitInformation")); + setDataId(Internal::QT_INFORMATION); + setPriority(26000); + connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()), this, SLOT(kitsWereLoaded())); } -Core::Id QtKitInformation::dataId() const -{ - static Core::Id id = Core::Id(Internal::QT_INFORMATION); - return id; -} - -unsigned int QtKitInformation::priority() const -{ - return 26000; -} - QVariant QtKitInformation::defaultValue(ProjectExplorer::Kit *k) const { Q_UNUSED(k); diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index c36743dbdd3..f25467a03b3 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -46,10 +46,6 @@ class QTSUPPORT_EXPORT QtKitInformation : public ProjectExplorer::KitInformation public: QtKitInformation(); - Core::Id dataId() const; - - unsigned int priority() const; // the higher the closer to the top. - QVariant defaultValue(ProjectExplorer::Kit *k) const; QList validate(const ProjectExplorer::Kit *k) const;