From eafb6670664ce223b0c71e65381442e5a9f345f9 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 4 Feb 2016 17:49:28 +0100 Subject: [PATCH] KitInformation: Make defaultValue take a const Kit * There is no reason not to. Change-Id: I4accb0b690173d93ad6f4c9dd0bce66d8de75faa Reviewed-by: Niels Weber --- src/plugins/android/androidgdbserverkitinformation.cpp | 4 ++-- src/plugins/android/androidgdbserverkitinformation.h | 4 ++-- .../cmakeprojectmanager/cmakekitinformation.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakekitinformation.h | 3 +-- .../cmakepreloadcachekitinformation.cpp | 2 +- .../cmakepreloadcachekitinformation.h | 2 +- src/plugins/debugger/debuggerkitinformation.cpp | 2 +- src/plugins/debugger/debuggerkitinformation.h | 2 +- src/plugins/projectexplorer/kitinformation.cpp | 10 +++++----- src/plugins/projectexplorer/kitinformation.h | 10 +++++----- src/plugins/projectexplorer/kitmanager.h | 2 +- .../qmakeprojectmanager/qmakekitinformation.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakekitinformation.h | 2 +- src/plugins/qtsupport/qtkitinformation.cpp | 2 +- src/plugins/qtsupport/qtkitinformation.h | 2 +- 15 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index 69209ae153e..d5f7b1591b1 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -53,7 +53,7 @@ AndroidGdbServerKitInformation::AndroidGdbServerKitInformation() setPriority(27999); // Just one less than Debugger! } -QVariant AndroidGdbServerKitInformation::defaultValue(Kit *kit) const +QVariant AndroidGdbServerKitInformation::defaultValue(const Kit *kit) const { return autoDetect(kit).toString(); } @@ -100,7 +100,7 @@ void AndroidGdbServerKitInformation::setGdbSever(Kit *kit, const FileName &gdbSe kit->setValue(AndroidGdbServerKitInformation::id(), gdbServerCommand.toString()); } -FileName AndroidGdbServerKitInformation::autoDetect(Kit *kit) +FileName AndroidGdbServerKitInformation::autoDetect(const Kit *kit) { ToolChain *tc = ToolChainKitInformation::toolChain(kit); if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_ID) diff --git a/src/plugins/android/androidgdbserverkitinformation.h b/src/plugins/android/androidgdbserverkitinformation.h index 11ce1a721d7..5a0122e8deb 100644 --- a/src/plugins/android/androidgdbserverkitinformation.h +++ b/src/plugins/android/androidgdbserverkitinformation.h @@ -68,7 +68,7 @@ class AndroidGdbServerKitInformation : public ProjectExplorer::KitInformation public: AndroidGdbServerKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *) const override; + QVariant defaultValue(const ProjectExplorer::Kit *) const override; QList validate(const ProjectExplorer::Kit *) const override; @@ -80,7 +80,7 @@ public: static bool isAndroidKit(const ProjectExplorer::Kit *kit); static Utils::FileName gdbServer(const ProjectExplorer::Kit *kit); static void setGdbSever(ProjectExplorer::Kit *kit, const Utils::FileName &gdbServerCommand); - static Utils::FileName autoDetect(ProjectExplorer::Kit *kit); + static Utils::FileName autoDetect(const ProjectExplorer::Kit *kit); }; } // namespace Internal diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 9e6f22be78c..914b2b5afbb 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -91,7 +91,7 @@ Core::Id CMakeKitInformation::defaultValue() return Core::Id(); } -QVariant CMakeKitInformation::defaultValue(Kit *) const +QVariant CMakeKitInformation::defaultValue(const Kit *) const { return defaultValue().toSetting(); } diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.h b/src/plugins/cmakeprojectmanager/cmakekitinformation.h index f9ab1dbf86a..f7a252b0993 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.h @@ -46,7 +46,7 @@ public: static Core::Id defaultValue(); // KitInformation interface - QVariant defaultValue(ProjectExplorer::Kit *) const override; + QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override; void setup(ProjectExplorer::Kit *k) override; void fix(ProjectExplorer::Kit *k) override; @@ -55,4 +55,3 @@ public: }; } // namespace CMakeProjectManager - diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp index 71b2d3606fc..c21b7e50f55 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.cpp @@ -51,7 +51,7 @@ Core::Id CMakePreloadCacheKitInformation::id() return "CMakeProjectManager.CMakePreloadCacheKitInformation"; } -QVariant CMakePreloadCacheKitInformation::defaultValue(Kit *) const +QVariant CMakePreloadCacheKitInformation::defaultValue(const Kit *) const { return QString(); } diff --git a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h index 328f7d8d28e..8580c8ce561 100644 --- a/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h +++ b/src/plugins/cmakeprojectmanager/cmakepreloadcachekitinformation.h @@ -40,7 +40,7 @@ public: static Core::Id id(); // KitInformation interface - QVariant defaultValue(ProjectExplorer::Kit *) const override; + QVariant defaultValue(const ProjectExplorer::Kit *) const override; QList validate(const ProjectExplorer::Kit *k) const override; void setup(ProjectExplorer::Kit *k) override; void fix(ProjectExplorer::Kit *k) override; diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index f277f033253..98ca869c2d5 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -55,7 +55,7 @@ DebuggerKitInformation::DebuggerKitInformation() setPriority(28000); } -QVariant DebuggerKitInformation::defaultValue(Kit *k) const +QVariant DebuggerKitInformation::defaultValue(const Kit *k) const { ToolChain *tc = ToolChainKitInformation::toolChain(k); if (!tc) diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index 056823a9931..5cc0498cd08 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -41,7 +41,7 @@ class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInform public: DebuggerKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *k) const override; + QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override { return DebuggerKitInformation::validateDebugger(k); } diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 24238e6b9bd..af6192fde08 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -56,7 +56,7 @@ SysRootKitInformation::SysRootKitInformation() setPriority(31000); } -QVariant SysRootKitInformation::defaultValue(Kit *k) const +QVariant SysRootKitInformation::defaultValue(const Kit *k) const { Q_UNUSED(k) return QString(); @@ -122,7 +122,7 @@ ToolChainKitInformation::ToolChainKitInformation() this, &ToolChainKitInformation::kitsWereLoaded); } -QVariant ToolChainKitInformation::defaultValue(Kit *k) const +QVariant ToolChainKitInformation::defaultValue(const Kit *k) const { Q_UNUSED(k); QList tcList = ToolChainManager::toolChains(); @@ -282,7 +282,7 @@ DeviceTypeKitInformation::DeviceTypeKitInformation() setPriority(33000); } -QVariant DeviceTypeKitInformation::defaultValue(Kit *k) const +QVariant DeviceTypeKitInformation::defaultValue(const Kit *k) const { Q_UNUSED(k); return QByteArray(Constants::DESKTOP_DEVICE_TYPE); @@ -364,7 +364,7 @@ DeviceKitInformation::DeviceKitInformation() this, &DeviceKitInformation::kitsWereLoaded); } -QVariant DeviceKitInformation::defaultValue(Kit *k) const +QVariant DeviceKitInformation::defaultValue(const Kit *k) const { Core::Id type = DeviceTypeKitInformation::deviceTypeId(k); // Use default device if that is compatible: @@ -529,7 +529,7 @@ EnvironmentKitInformation::EnvironmentKitInformation() setPriority(29000); } -QVariant EnvironmentKitInformation::defaultValue(Kit *k) const +QVariant EnvironmentKitInformation::defaultValue(const Kit *k) const { Q_UNUSED(k) return QStringList(); diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index 3a3fa527298..ca49e57ad3e 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -49,7 +49,7 @@ class PROJECTEXPLORER_EXPORT SysRootKitInformation : public KitInformation public: SysRootKitInformation(); - QVariant defaultValue(Kit *k) const override; + QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; @@ -74,7 +74,7 @@ class PROJECTEXPLORER_EXPORT ToolChainKitInformation : public KitInformation public: ToolChainKitInformation(); - QVariant defaultValue(Kit *k) const override; + QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; void fix(Kit *k) override; @@ -113,7 +113,7 @@ class PROJECTEXPLORER_EXPORT DeviceTypeKitInformation : public KitInformation public: DeviceTypeKitInformation(); - QVariant defaultValue(Kit *k) const override; + QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; @@ -142,7 +142,7 @@ class PROJECTEXPLORER_EXPORT DeviceKitInformation : public KitInformation public: DeviceKitInformation(); - QVariant defaultValue(Kit *k) const override; + QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; void fix(Kit *k) override; @@ -180,7 +180,7 @@ class PROJECTEXPLORER_EXPORT EnvironmentKitInformation : public KitInformation public: EnvironmentKitInformation(); - QVariant defaultValue(Kit *k) const override; + QVariant defaultValue(const Kit *k) const override; QList validate(const Kit *k) const override; void fix(Kit *k) override; diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index 63d5396b408..3a9ccd9b5d7 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -71,7 +71,7 @@ public: Core::Id id() const { return m_id; } int priority() const { return m_priority; } - virtual QVariant defaultValue(Kit *) const = 0; + virtual QVariant defaultValue(const Kit *) const = 0; // called to find issues with the kit virtual QList validate(const Kit *) const = 0; diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp index c151550d2cc..0974c96a225 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.cpp @@ -45,7 +45,7 @@ QmakeKitInformation::QmakeKitInformation() setPriority(24000); } -QVariant QmakeKitInformation::defaultValue(Kit *k) const +QVariant QmakeKitInformation::defaultValue(const Kit *k) const { Q_UNUSED(k); return QString(); diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.h b/src/plugins/qmakeprojectmanager/qmakekitinformation.h index bb382d01b5b..79e73a5f3b0 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.h +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.h @@ -39,7 +39,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::K public: QmakeKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *k) const override; + QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override; void setup(ProjectExplorer::Kit *k) override; diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index f4d9220785e..f0683f06edb 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -53,7 +53,7 @@ QtKitInformation::QtKitInformation() this, &QtKitInformation::kitsWereLoaded); } -QVariant QtKitInformation::defaultValue(ProjectExplorer::Kit *k) const +QVariant QtKitInformation::defaultValue(const Kit *k) const { Q_UNUSED(k); diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index ed762ac491c..2dd7ecc55a3 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -43,7 +43,7 @@ class QTSUPPORT_EXPORT QtKitInformation : public ProjectExplorer::KitInformation public: QtKitInformation(); - QVariant defaultValue(ProjectExplorer::Kit *k) const override; + QVariant defaultValue(const ProjectExplorer::Kit *k) const override; QList validate(const ProjectExplorer::Kit *k) const override; void fix(ProjectExplorer::Kit *) override;