From 4192d7d62fe65b70b9f00f540425ea52bcb68c81 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 4 Sep 2018 10:36:44 +0200
Subject: ProjectExplorer: Compactify runconfiguration aspect creation

Change-Id: I12394d3df8deb7666be6ac3f112082f915454e82
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/android/androidrunconfiguration.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/plugins/android/androidrunconfiguration.cpp')

diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index 9948f69b5d..17cefd1d89 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -111,28 +111,25 @@ void BaseStringListAspect::setLabel(const QString &label)
 AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Core::Id id)
     : RunConfiguration(target, id)
 {
-    addExtraAspect(new AndroidRunEnvironmentAspect(this));
-    addExtraAspect(new ArgumentsAspect(this));
+    addAspect<AndroidRunEnvironmentAspect>();
+    addAspect<ArgumentsAspect>();
 
-    auto amStartArgsAspect = new BaseStringAspect(this);
+    auto amStartArgsAspect = addAspect<BaseStringAspect>();
     amStartArgsAspect->setId(Constants::ANDROID_AMSTARTARGS);
     amStartArgsAspect->setSettingsKey("Android.AmStartArgsKey");
     amStartArgsAspect->setLabelText(tr("Activity manager start options:"));
     amStartArgsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
     amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History");
-    addExtraAspect(amStartArgsAspect);
 
-    auto preStartShellCmdAspect = new BaseStringListAspect(this);
+    auto preStartShellCmdAspect = addAspect<BaseStringListAspect>();
     preStartShellCmdAspect->setId(Constants::ANDROID_PRESTARTSHELLCMDLIST);
     preStartShellCmdAspect->setSettingsKey("Android.PreStartShellCmdListKey");
     preStartShellCmdAspect->setLabel(tr("Shell commands to run on Android device before application launch."));
-    addExtraAspect(preStartShellCmdAspect);
 
-    auto postStartShellCmdAspect = new BaseStringListAspect(this);
+    auto postStartShellCmdAspect = addAspect<BaseStringListAspect>();
     postStartShellCmdAspect->setId(Constants::ANDROID_POSTFINISHSHELLCMDLIST);
     postStartShellCmdAspect->setSettingsKey("Android.PostStartShellCmdListKey");
     postStartShellCmdAspect->setLabel(tr("Shell commands to run on Android device after application quits."));
-    addExtraAspect(postStartShellCmdAspect);
 
     setOutputFormatter<QtSupport::QtOutputFormatter>();
     connect(target->project(), &Project::parsingFinished, this, [this] {
-- 
cgit v1.2.1