From 41feefd670d8160f070f7a408e306e1965134527 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 16 Sep 2015 15:50:48 +0300
Subject: [PATCH] KitManager: Cleanup

* Deduplicate call to setDefaultKit.
* Replace 2 calls to Utils::findOrDefault with list concatenation.

Change-Id: I9822d34f1eb25447b35f33aad0497756ef46d101
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 src/plugins/projectexplorer/kitmanager.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index d7766a00e00..0125b0e8a94 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -220,18 +220,10 @@ void KitManager::restoreKits()
     }
 
     Kit *k = find(userKits.defaultKit);
-    if (k) {
+    if (!k && !defaultKit())
+        k = Utils::findOrDefault(kitsToRegister + sdkKits, &Kit::isValid);
+    if (k)
         setDefaultKit(k);
-    } else if (!defaultKit()) {
-        k = Utils::findOrDefault(kitsToRegister, &Kit::isValid);
-        if (k) {
-            setDefaultKit(k);
-        } else {
-            k = Utils::findOrDefault(sdkKits, &Kit::isValid);
-            if (k)
-                setDefaultKit(k);
-        }
-    }
 
     d->m_writer = new PersistentSettingsWriter(settingsFileName(), QLatin1String("QtCreatorProfiles"));
     d->m_initialized = true;