Kits: Simplify handling of sticky kit information

Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>

4 files changed, 13 insertions, 16 deletions

diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
index f3803f5d0c..4b91427ea5 100644
--- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
@@ -38,8 +38,8 @@
 namespace Qt4ProjectManager {
 namespace Internal {
 
-QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, bool sticky) :
-    ProjectExplorer::KitConfigWidget(k, sticky),
+QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) :
+    ProjectExplorer::KitConfigWidget(k, ki),
     m_lineEdit(new QLineEdit),
     m_ignoreChange(false)
 {
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.h b/src/plugins/qt4projectmanager/qmakekitconfigwidget.h
index 99c09403c1..94052f9cdb 100644
--- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.h
@@ -44,7 +44,7 @@ class QmakeKitConfigWidget : public ProjectExplorer::KitConfigWidget
     Q_OBJECT
 
 public:
-    explicit QmakeKitConfigWidget(ProjectExplorer::Kit *k, bool sticky);
+    QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki);
 
     QWidget *mainWidget() const;
     QString displayName() const;
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
index 7e1b8d8170..fcd668c8e5 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
@@ -42,12 +42,10 @@ using namespace Utils;
 
 namespace Qt4ProjectManager {
 
-const char MKSPEC_INFORMATION[] = "QtPM4.mkSpecInformation";
-
 QmakeKitInformation::QmakeKitInformation()
 {
     setObjectName(QLatin1String("QmakeKitInformation"));
-    setDataId(MKSPEC_INFORMATION);
+    setId(QmakeKitInformation::id());
     setPriority(24000);
 }
 
@@ -99,7 +97,7 @@ void QmakeKitInformation::setup(Kit *k)
 
 KitConfigWidget *QmakeKitInformation::createConfigWidget(Kit *k) const
 {
-    return new Internal::QmakeKitConfigWidget(k, isSticky(k));
+    return new Internal::QmakeKitConfigWidget(k, this);
 }
 
 KitInformation::ItemList QmakeKitInformation::toUserOutput(const Kit *k) const
@@ -107,11 +105,16 @@ KitInformation::ItemList QmakeKitInformation::toUserOutput(const Kit *k) const
     return ItemList() << qMakePair(tr("mkspec"), mkspec(k).toUserOutput());
 }
 
+Core::Id QmakeKitInformation::id()
+{
+    return "QtPM4.mkSpecInformation";
+}
+
 FileName QmakeKitInformation::mkspec(const Kit *k)
 {
     if (!k)
         return FileName();
-    return FileName::fromString(k->value(MKSPEC_INFORMATION).toString());
+    return FileName::fromString(k->value(QmakeKitInformation::id()).toString());
 }
 
 FileName QmakeKitInformation::effectiveMkspec(const Kit *k)
@@ -126,7 +129,7 @@ FileName QmakeKitInformation::effectiveMkspec(const Kit *k)
 
 void QmakeKitInformation::setMkspec(Kit *k, const FileName &fn)
 {
-    k->setValue(MKSPEC_INFORMATION, fn == defaultMkspec(k) ? QString() : fn.toString());
+    k->setValue(QmakeKitInformation::id(), fn == defaultMkspec(k) ? QString() : fn.toString());
 }
 
 FileName QmakeKitInformation::defaultMkspec(const Kit *k)
@@ -138,9 +141,4 @@ FileName QmakeKitInformation::defaultMkspec(const Kit *k)
     return version->mkspecFor(ToolChainKitInformation::toolChain(k));
 }
 
-void QmakeKitInformation::setSticky(Kit *k, bool b)
-{
-    k->setSticky(MKSPEC_INFORMATION, b);
-}
-
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.h b/src/plugins/qt4projectmanager/qmakekitinformation.h
index 78bc4dea3a..c2e86e1913 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.h
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.h
@@ -52,12 +52,11 @@ public:
 
     ItemList toUserOutput(const ProjectExplorer::Kit *k) const;
 
+    static Core::Id id();
     static void setMkspec(ProjectExplorer::Kit *k, const Utils::FileName &fn);
     static Utils::FileName mkspec(const ProjectExplorer::Kit *k);
     static Utils::FileName effectiveMkspec(const ProjectExplorer::Kit *k);
     static Utils::FileName defaultMkspec(const ProjectExplorer::Kit *k);
-
-    static void setSticky(ProjectExplorer::Kit *k, bool b);
 };
 
 } // namespace Qt4ProjectManager