From f133ca30e365aef5d757dc8b86a4f44dd431853b Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 16 Nov 2015 17:10:14 +0100 Subject: [PATCH] TargetSettingsPanel: Remove unnecessary method Clean up the necessary one a little bit. Change-Id: Iba62b507461297c669b96a549714c117d385b518 Reviewed-by: Niels Weber --- .../projectexplorer/targetsettingspanel.cpp | 16 ++++++---------- .../projectexplorer/targetsettingspanel.h | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index 8d45f695c20..935d6b231d6 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -339,11 +339,7 @@ void TargetSettingsPanelWidget::addActionTriggered(QAction *action) void TargetSettingsPanelWidget::removeTarget() { Target *t = m_targets.at(m_menuTargetIndex); - removeTarget(t); -} -void TargetSettingsPanelWidget::removeTarget(Target *t) -{ if (BuildManager::isBuilding(t)) { QMessageBox box; QPushButton *closeAnyway = box.addButton(tr("Cancel Build && Remove Kit"), QMessageBox::AcceptRole); @@ -465,11 +461,11 @@ void TargetSettingsPanelWidget::updateTargetButtons() if (m_project->targets().size() < 2) removeAction->setEnabled(false); - connect(m_changeMenu, SIGNAL(triggered(QAction*)), - this, SLOT(changeActionTriggered(QAction*))); - connect(m_duplicateMenu, SIGNAL(triggered(QAction*)), - this, SLOT(duplicateActionTriggered(QAction*))); - connect(removeAction, SIGNAL(triggered()), this, SLOT(removeTarget())); + connect(m_changeMenu, &QMenu::triggered, + this, &TargetSettingsPanelWidget::changeActionTriggered); + connect(m_duplicateMenu, &QMenu::triggered, + this, &TargetSettingsPanelWidget::duplicateActionTriggered); + connect(removeAction, &QAction::triggered, this, &TargetSettingsPanelWidget::removeTarget); foreach (Kit *k, KitManager::sortKits(KitManager::kits())) { if (m_project->target(k)) @@ -524,7 +520,7 @@ void TargetSettingsPanelWidget::importTarget(const Utils::FileName &path) foreach (BuildInfo *info, toImport) { target = m_project->target(info->kitId); if (!target) { - target = new Target(m_project, KitManager::find(info->kitId)); + target = m_project->createTarget(KitManager::find(info->kitId)); m_project->addTarget(target); } bc = info->factory()->create(target, info); diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h index 17d0bb126ff..2b8e2bb62fc 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.h +++ b/src/plugins/projectexplorer/targetsettingspanel.h @@ -84,7 +84,6 @@ private slots: void changeActionTriggered(QAction *action); void duplicateActionTriggered(QAction *action); private: - void removeTarget(Target *t); void importTarget(const Utils::FileName &path); void createAction(Kit *k, QMenu *menu);