1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index f989b955cc..14288d7bb2 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -62,7 +62,7 @@ namespace ProjectExplorer {
 class KitList
 {
 public:
-    Core::Id defaultKit;
+    Utils::Id defaultKit;
     std::vector<std::unique_ptr<Kit>> kits;
 };
 
@@ -175,7 +175,7 @@ void KitManager::restoreKits()
     std::vector<std::unique_ptr<Kit>> resultList;
 
     // read all kits from user file
-    Core::Id defaultUserKit;
+    Utils::Id defaultUserKit;
     std::vector<std::unique_ptr<Kit>> kitsToCheck;
     {
         KitList userKits = restoreKitsHelper(settingsFileName());
@@ -262,7 +262,7 @@ void KitManager::restoreKits()
 
     if (resultList.empty() || !haveKitForBinary) {
         // No kits exist yet, so let's try to autoconfigure some from the toolchains we know.
-        QHash<Abi, QHash<Core::Id, ToolChain *>> uniqueToolchains;
+        QHash<Abi, QHash<Utils::Id, ToolChain *>> uniqueToolchains;
 
         // On Linux systems, we usually detect a plethora of same-ish toolchains. The following
         // algorithm gives precedence to icecc and ccache and otherwise simply chooses the one with
@@ -437,7 +437,7 @@ void KitManager::saveKits()
                 d->m_defaultKit ? QString::fromLatin1(d->m_defaultKit->id().name()) : QString());
     data.insert(KIT_IRRELEVANT_ASPECTS_KEY,
                 transform<QVariantList>(d->m_irrelevantAspects, &Id::toSetting));
-    d->m_writer->save(data, ICore::mainWindow());
+    d->m_writer->save(data, ICore::dialogParent());
 }
 
 bool KitManager::isLoaded()
@@ -594,7 +594,7 @@ void KitManager::notifyAboutUpdate(Kit *k)
         emit m_instance->unmanagedKitUpdated(k);
 }
 
-Kit *KitManager::registerKit(const std::function<void (Kit *)> &init, Core::Id id)
+Kit *KitManager::registerKit(const std::function<void (Kit *)> &init, Utils::Id id)
 {
     QTC_ASSERT(isLoaded(), return nullptr);
 
@@ -677,10 +677,10 @@ void KitAspect::addToEnvironment(const Kit *k, Environment &env) const
     Q_UNUSED(env)
 }
 
-IOutputParser *KitAspect::createOutputParser(const Kit *k) const
+QList<OutputLineParser *> KitAspect::createOutputParsers(const Kit *k) const
 {
     Q_UNUSED(k)
-    return nullptr;
+    return {};
 }
 
 QString KitAspect::displayNamePostfix(const Kit *k) const
@@ -717,7 +717,7 @@ KitAspectWidget::KitAspectWidget(Kit *kit, const KitAspect *ki) : m_kit(kit),
     m_kitInformation(ki), m_isSticky(kit->isSticky(ki->id()))
 { }
 
-Core::Id KitAspectWidget::kitInformationId() const
+Utils::Id KitAspectWidget::kitInformationId() const
 {
     return m_kitInformation->id();
 }