From 22e3a7b3a4651a487f0e408a8aa255706337a689 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 16 Nov 2015 17:10:55 +0100 Subject: [PATCH] Target: Make constructor private Use Project::createTarget consistently Change-Id: Ic8b60f35a830080d325758c93bca7068c9859c59 Reviewed-by: Niels Weber Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/target.h | 3 +-- src/plugins/pythoneditor/pythoneditorplugin.cpp | 2 +- src/plugins/qbsprojectmanager/qbsproject.cpp | 9 ++------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index cd5ec80c0c9..0655c445648 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -59,7 +59,6 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration Q_OBJECT public: - Target(Project *parent, Kit *k); ~Target() override; Project *project() const; @@ -158,6 +157,7 @@ signals: void buildDirectoryChanged(); private: + Target(Project *parent, Kit *k); void setEnabled(bool); bool fromMap(const QVariantMap &map) override; @@ -169,7 +169,6 @@ private: void changeBuildConfigurationEnabled(); void changeDeployConfigurationEnabled(); void changeRunConfigurationEnabled(); - void handleKitUpdates(ProjectExplorer::Kit *k); void handleKitRemoval(ProjectExplorer::Kit *k); diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 400f05ba93e..b9afaa69c47 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -863,7 +863,7 @@ Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *e if (res == RestoreResult::Ok) { Kit *defaultKit = KitManager::defaultKit(); if (!activeTarget() && defaultKit) - addTarget(new Target(this, defaultKit)); + addTarget(createTarget(defaultKit)); refresh(); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 78ee6de5355..a6199608211 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -606,13 +606,8 @@ Project::RestoreResult QbsProject::fromMap(const QVariantMap &map, QString *erro return result; Kit *defaultKit = KitManager::defaultKit(); - if (!activeTarget() && defaultKit) { - Target *t = new Target(this, defaultKit); - t->updateDefaultBuildConfigurations(); - t->updateDefaultDeployConfigurations(); - t->updateDefaultRunConfigurations(); - addTarget(t); - } + if (!activeTarget() && defaultKit) + addTarget(createTarget(defaultKit)); return RestoreResult::Ok; }