Kit: Improve the options page

* Update warning icon as changes happen
* Make clone clone the current settings, not what used to be there
  before changes were made
* Make sure the edited entry is visible in list view
* I find the KitModel much easier to understand now

Task-number: QTCREATORBUG-7862
Task-number: QTCREATORBUG-7803
Change-Id: I124c2e5a96cea7386896084e1027ba79a8be20b7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/plugins/projectexplorer/kitmodel.h b/src/plugins/projectexplorer/kitmodel.h
index 065a20047b..d0ebf3bfb1 100644
--- a/src/plugins/projectexplorer/kitmodel.h
+++ b/src/plugins/projectexplorer/kitmodel.h
@@ -42,11 +42,11 @@ QT_END_NAMESPACE
 namespace ProjectExplorer {
 
 class Kit;
-class KitConfigWidget;
 class KitFactory;
 class KitManager;
 
 namespace Internal {
+class KitManagerConfigWidget;
 
 class KitNode;
 
@@ -77,7 +77,7 @@ public:
     void setDefaultKit(const QModelIndex &index);
     bool isDefaultKit(const QModelIndex &index);
 
-    KitConfigWidget *widget(const QModelIndex &);
+    ProjectExplorer::Internal::KitManagerConfigWidget *widget(const QModelIndex &);
 
     bool isDirty() const;
     bool isDirty(Kit *k) const;
@@ -85,7 +85,7 @@ public:
     void apply();
 
     void markForRemoval(Kit *k);
-    void markForAddition(Kit *k);
+    Kit *markForAddition(Kit *baseKit);
 
 signals:
     void kitStateChanged();
@@ -93,21 +93,19 @@ signals:
 private slots:
     void addKit(ProjectExplorer::Kit *k);
     void removeKit(ProjectExplorer::Kit *k);
-    void updateKit(ProjectExplorer::Kit *k);
     void changeDefaultKit();
     void setDirty();
 
 private:
     QModelIndex index(KitNode *, int column = 0) const;
-    KitNode *find(Kit *k) const;
-    KitNode *createNode(KitNode *parent, Kit *k, bool changed);
+    KitNode *findWorkingCopy(Kit *k) const;
+    KitNode *createNode(KitNode *parent, Kit *k);
     void setDefaultNode(KitNode *node);
 
     KitNode *m_root;
     KitNode *m_autoRoot;
     KitNode *m_manualRoot;
 
-    QList<KitNode *> m_toAddList;
     QList<KitNode *> m_toRemoveList;
 
     QBoxLayout *m_parentLayout;