Android: Simplify run control construction

Take advantage of new infrastructure.

Change-Id: If2d2f839b8be1fad2be3b79e21de3c0e475d88cf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/android/android.pro

@@ -12,7 +12,6 @@ HEADERS += \
     androidmanager.h \
     androidrunconfiguration.h \
     androidruncontrol.h \
-    androidrunfactories.h \
     androidsettingspage.h \
     androidsettingswidget.h \
     androidtoolchain.h \
@@ -58,7 +57,6 @@ SOURCES += \
     androidmanager.cpp \
     androidrunconfiguration.cpp \
     androidruncontrol.cpp \
-    androidrunfactories.cpp \
     androidsettingspage.cpp \
     androidsettingswidget.cpp \
     androidtoolchain.cpp \

src/plugins/android/android.qbs

@@ -83,8 +83,6 @@ Project {
             "androidrunconfigurationwidget.ui",
             "androidruncontrol.cpp",
             "androidruncontrol.h",
-            "androidrunfactories.cpp",
-            "androidrunfactories.h",
             "androidrunnable.cpp",
             "androidrunnable.h",
             "androidrunner.cpp",

src/plugins/android/androidplugin.cpp

@@ -25,22 +25,26 @@
 
 #include "androidplugin.h"
 
-#include "androidconstants.h"
+#include "androidanalyzesupport.h"
 #include "androidconfigurations.h"
+#include "androidconstants.h"
+#include "androiddebugsupport.h"
+#include "androiddeployconfiguration.h"
 #include "androiddeployqtstep.h"
 #include "androiddevice.h"
 #include "androiddevicefactory.h"
-#include "androidmanager.h"
-#include "androidrunfactories.h"
-#include "androidsettingspage.h"
-#include "androidtoolchain.h"
-#include "androidqtversionfactory.h"
-#include "androiddeployconfiguration.h"
 #include "androidgdbserverkitinformation.h"
+#include "androidmanager.h"
 #include "androidmanifesteditorfactory.h"
 #include "androidpotentialkit.h"
+#include "androidqtversionfactory.h"
+#include "androidrunconfiguration.h"
+#include "androidruncontrol.h"
+#include "androidsettingspage.h"
+#include "androidtoolchain.h"
 #include "javacompletionassistprovider.h"
 #include "javaeditor.h"
+
 #ifdef HAVE_QBS
 #  include "androidqbspropertyprovider.h"
 #endif
@@ -55,6 +59,8 @@
 #include <QtPlugin>
 
 using namespace ProjectExplorer;
+using namespace ProjectExplorer::Constants;
+using namespace Android::Internal;
 
 namespace Android {
 
@@ -66,9 +72,13 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
     Q_UNUSED(arguments);
     Q_UNUSED(errorMessage);
 
+    RunControl::registerWorker<AndroidRunConfiguration, AndroidRunSupport>(NORMAL_RUN_MODE);
+    RunControl::registerWorker<AndroidRunConfiguration, AndroidDebugSupport>(DEBUG_RUN_MODE);
+    RunControl::registerWorker<AndroidRunConfiguration, AndroidDebugSupport>(DEBUG_RUN_MODE_WITH_BREAK_ON_MAIN);
+    RunControl::registerWorker<AndroidRunConfiguration, AndroidQmlProfilerSupport>(QML_PROFILER_RUN_MODE);
+
     new AndroidConfigurations(this);
 
-    addAutoReleasedObject(new Internal::AndroidRunControlFactory);
     addAutoReleasedObject(new Internal::AndroidDeployQtStepFactory);
     addAutoReleasedObject(new Internal::AndroidSettingsPage);
     addAutoReleasedObject(new Internal::AndroidQtVersionFactory);

src/plugins/android/androidrunfactories.cpp

@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "androidrunfactories.h"
-
-#include "androidconstants.h"
-#include "androiddebugsupport.h"
-#include "androidanalyzesupport.h"
-#include "androidrunconfiguration.h"
-#include "androidruncontrol.h"
-#include "androidmanager.h"
-
-#include <debugger/debuggerconstants.h>
-
-using namespace ProjectExplorer;
-
-namespace Android {
-namespace Internal {
-
-AndroidRunControlFactory::AndroidRunControlFactory(QObject *parent)
-    : IRunControlFactory(parent)
-{
-}
-
-bool AndroidRunControlFactory::canRun(RunConfiguration *runConfiguration, Core::Id mode) const
-{
-    if (mode != ProjectExplorer::Constants::NORMAL_RUN_MODE
-            && mode != ProjectExplorer::Constants::DEBUG_RUN_MODE
-            && mode != ProjectExplorer::Constants::DEBUG_RUN_MODE_WITH_BREAK_ON_MAIN
-            && mode != ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
-        return false;
-    }
-    return qobject_cast<AndroidRunConfiguration *>(runConfiguration);
-}
-
-RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig, Core::Id mode, QString *)
-{
-    Q_ASSERT(canRun(runConfig, mode));
-    if (mode == ProjectExplorer::Constants::NORMAL_RUN_MODE) {
-        auto runControl = new RunControl(runConfig, mode);
-        (void) new AndroidRunSupport(runControl);
-        return runControl;
-    }
-    if (mode == ProjectExplorer::Constants::DEBUG_RUN_MODE
-            || mode == ProjectExplorer::Constants::DEBUG_RUN_MODE_WITH_BREAK_ON_MAIN) {
-        auto runControl = new RunControl(runConfig, mode);
-        (void) new AndroidDebugSupport(runControl);
-        return runControl;
-    }
-    if (mode == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) {
-        auto runControl = new RunControl(runConfig, mode);
-        (void) new AndroidQmlProfilerSupport(runControl);
-        return runControl;
-    }
-    QTC_CHECK(false); // The other run modes are not supported
-    return 0;
-}
-
-} // namespace Internal
-} // namespace Android

src/plugins/android/androidrunfactories.h

@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include "android_global.h"
-#include <projectexplorer/runconfiguration.h>
-
-
-namespace ProjectExplorer {
-class RunControl;
-class RunConfigWidget;
-class Target;
-class Node;
-} // namespace ProjectExplorer
-
-namespace Android {
-namespace Internal {
-
-class AndroidRunControlFactory : public ProjectExplorer::IRunControlFactory
-{
-    Q_OBJECT
-
-public:
-    explicit AndroidRunControlFactory(QObject *parent = 0);
-
-    bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
-                Core::Id mode) const override;
-    ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
-                                        Core::Id mode, QString *errorMessage) override;
-};
-
-} // namespace Internal
-} // namespace Android

src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h

@@ -25,13 +25,10 @@
 
 #pragma once
 
-#include <android/androidrunfactories.h>
 #include <projectexplorer/runconfiguration.h>
 #include <qmakeprojectmanager/qmakerunconfigurationfactory.h>
 
 namespace ProjectExplorer {
-class RunControl;
-class RunConfigWidget;
 class Target;
 class Node;
 } // namespace ProjectExplorer