Get rid of unneeded includes of RunControl

Removed also some other includes that were marked
with yellow triangles. In some cases includes of
runcontrol.h were substituted with other includes,
like qtcassert.h.

Change-Id: Ica40f68198c7f8f70e6047acb2eddc8ef017e43d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/android/androiddebugsupport.cpp

@@ -4,14 +4,12 @@
 #include "androiddebugsupport.h"
 
 #include "androidconstants.h"
-#include "androidglobal.h"
 #include "androidrunner.h"
 #include "androidmanager.h"
 #include "androidqtversion.h"
 
 #include <debugger/debuggerkitinformation.h>
 #include <debugger/debuggerrunconfigurationaspect.h>
-#include <debugger/debuggerruncontrol.h>
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>

src/plugins/android/androidplugin.cpp

@@ -6,7 +6,6 @@
 #include "androiddebugsupport.h"
 #include "androiddeployqtstep.h"
 #include "androiddevice.h"
-#include "androidmanager.h"
 #include "androidmanifesteditorfactory.h"
 #include "androidpackageinstallationstep.h"
 #include "androidplugin.h"

src/plugins/android/androidrunnerworker.h

@@ -4,14 +4,19 @@
 
 #pragma once
 
-#include <projectexplorer/runcontrol.h>
-
 #include <qmldebug/qmldebugcommandlinearguments.h>
 
+#include <utils/environment.h>
 #include <utils/port.h>
 
 #include <QFuture>
 
+QT_BEGIN_NAMESPACE
+class QProcess;
+QT_END_NAMESPACE
+
+namespace ProjectExplorer { class RunWorker; }
+
 namespace Android {
 
 class AndroidDeviceInfo;

src/plugins/baremetal/baremetaldebugsupport.cpp

@@ -10,7 +10,6 @@
 #include "idebugserverprovider.h"
 
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerruncontrol.h>
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>

src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp

@@ -11,8 +11,6 @@
 #include <baremetal/baremetaltr.h>
 #include <baremetal/debugserverprovidermanager.h>
 
-#include <debugger/debuggerruncontrol.h>
-
 #include <utils/qtcassert.h>
 
 #include <QComboBox>

src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp

@@ -11,8 +11,6 @@
 #include <baremetal/baremetaltr.h>
 #include <baremetal/debugserverprovidermanager.h>
 
-#include <debugger/debuggerruncontrol.h>
-
 #include <utils/qtcassert.h>
 
 #include <QCheckBox>

src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp

@@ -11,8 +11,6 @@
 #include <baremetal/baremetaldebugsupport.h>
 #include <baremetal/debugserverprovidermanager.h>
 
-#include <debugger/debuggerruncontrol.h>
-
 #include <utils/qtcassert.h>
 
 #include <QComboBox>

src/plugins/baremetal/debugservers/uvsc/uvproject.cpp

@@ -9,7 +9,6 @@
 #include <debugger/debuggerkitinformation.h>
 #include <debugger/debuggerruncontrol.h>
 
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 

src/plugins/boot2qt/qdbdevice.cpp

@@ -11,7 +11,6 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/sshparameters.h>
-#include <projectexplorer/runcontrol.h>
 
 #include <remotelinux/linuxprocessinterface.h>
 

src/plugins/boot2qt/qdbstopapplicationstep.cpp

@@ -8,7 +8,6 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <remotelinux/abstractremotelinuxdeployservice.h>

src/plugins/debugger/analyzer/startremotedialog.cpp

@@ -11,7 +11,8 @@
 #include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/runcontrol.h>
+
+#include <utils/commandline.h>
 
 #include <QDialogButtonBox>
 #include <QFormLayout>

src/plugins/debugger/cdb/cdbengine.cpp

@@ -15,7 +15,6 @@
 #include <debugger/debuggerinternalconstants.h>
 #include <debugger/debuggermainwindow.h>
 #include <debugger/debuggerprotocol.h>
-#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggertooltipmanager.h>
 #include <debugger/debuggertr.h>
 #include <debugger/disassembleragent.h>

src/plugins/debugger/gdb/gdbengine.cpp

@@ -10,7 +10,6 @@
 #include <debugger/debuggermainwindow.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerprotocol.h>
-#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggersourcepathmappingwidget.h>
 #include <debugger/debuggertooltipmanager.h>
 #include <debugger/debuggertr.h>

src/plugins/debugger/qml/qmlengine.cpp

@@ -13,7 +13,6 @@
 #include <debugger/debuggeractions.h>
 #include <debugger/debuggercore.h>
 #include <debugger/debuggerinternalconstants.h>
-#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggertooltipmanager.h>
 #include <debugger/debuggertr.h>
 #include <debugger/sourcefileshandler.h>

src/plugins/debugger/qml/qmlinspectoragent.cpp

@@ -8,7 +8,6 @@
 #include <debugger/debuggercore.h>
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerinternalconstants.h>
-#include <debugger/debuggerruncontrol.h>
 #include <debugger/debuggertr.h>
 #include <debugger/watchhandler.h>
 

src/plugins/docker/dockerdevice.cpp

@@ -20,7 +20,6 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>

src/plugins/ios/iosrunner.cpp

@@ -1,7 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "iosbuildstep.h"
 #include "iosconfigurations.h"
 #include "iosdevice.h"
 #include "iosrunconfiguration.h"
@@ -11,7 +10,6 @@
 
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerkitinformation.h>
-#include <debugger/debuggerruncontrol.h>
 
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/ios/iosrunner.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "iosconfigurations.h"
 #include "iostoolhandler.h"
 #include "iossimulator.h"
 

src/plugins/mcusupport/mcusupportdevice.cpp

@@ -4,8 +4,6 @@
 #include "mcusupportdevice.h"
 #include "mcusupportconstants.h"
 
-#include <projectexplorer/runcontrol.h>
-
 using namespace ProjectExplorer;
 using namespace Utils;
 

src/plugins/nim/project/nimblerunconfiguration.cpp

@@ -10,7 +10,6 @@
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfigurationaspects.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <utils/algorithm.h>

src/plugins/nim/project/nimrunconfiguration.cpp

@@ -10,7 +10,8 @@
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/runconfigurationaspects.h>
-#include <projectexplorer/runcontrol.h>
+
+#include <utils/qtcassert.h>
 
 #include <QDir>
 #include <QFileInfo>

src/plugins/perfprofiler/perfconfigwidget.cpp

@@ -3,7 +3,6 @@
 
 #include "perfconfigeventsmodel.h"
 #include "perfconfigwidget.h"
-#include "perfprofilerconstants.h"
 #include "perfprofilertr.h"
 
 #include <coreplugin/messagebox.h>
@@ -11,11 +10,11 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <utils/aspects.h>
 #include <utils/layoutbuilder.h>
+#include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
 #include <QComboBox>

src/plugins/perfprofiler/perfprofilertool.cpp

@@ -24,6 +24,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 

src/plugins/perfprofiler/perfprofilertool.h

@@ -11,13 +11,18 @@
 #include "perftimelinemodelmanager.h"
 
 #include <debugger/debuggermainwindow.h>
-#include <projectexplorer/runcontrol.h>
 #include <tracing/timelinezoomcontrol.h>
 #include <utils/fileinprojectfinder.h>
 
 #include <QLabel>
 #include <QToolButton>
 
+namespace ProjectExplorer {
+class Kit;
+class Project;
+class RunControl;
+}
+
 namespace PerfProfiler {
 namespace Internal {
 

src/plugins/perfprofiler/perftracepointdialog.cpp

@@ -8,7 +8,6 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 

src/plugins/projectexplorer/customexecutablerunconfiguration.cpp

@@ -5,6 +5,7 @@
 
 #include "localenvironmentaspect.h"
 #include "projectexplorerconstants.h"
+#include "runconfigurationaspects.h"
 #include "target.h"
 
 using namespace Utils;

src/plugins/projectexplorer/customexecutablerunconfiguration.h

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "runconfigurationaspects.h"
 #include "runcontrol.h"
 
 namespace ProjectExplorer {

src/plugins/projectexplorer/devicesupport/desktopdevice.cpp

@@ -9,12 +9,12 @@
 #include <coreplugin/fileutils.h>
 
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/runcontrol.h>
 
 #include <utils/devicefileaccess.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/portlist.h>
+#include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/url.h>
 

src/plugins/projectexplorer/waitforstopdialog.cpp

@@ -3,6 +3,8 @@
 
 #include "waitforstopdialog.h"
 
+#include "runcontrol.h"
+
 #include <utils/algorithm.h>
 
 #include <QVBoxLayout>

src/plugins/projectexplorer/waitforstopdialog.h

@@ -7,20 +7,21 @@
 #include <QDialog>
 #include <QElapsedTimer>
 
-#include "runcontrol.h"
-
 QT_BEGIN_NAMESPACE
 class QLabel;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
+
+class RunControl;
+
 namespace Internal {
 
 class WaitForStopDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit WaitForStopDialog(const QList<ProjectExplorer::RunControl *> &runControls);
+    explicit WaitForStopDialog(const QList<RunControl *> &runControls);
 
     bool canceled();
 private:

src/plugins/python/pythonplugin.cpp

@@ -13,7 +13,6 @@
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/taskhub.h>
 
 #include <utils/fsengine/fileiconprovider.h>

src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp

@@ -33,7 +33,6 @@
 #include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projecttree.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 

src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp

@@ -30,7 +30,6 @@
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/projecttree.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/projectexplorer.h>

src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <qmlprofiler/qmlprofilermodelmanager.h>
-#include <qmlprofiler/qmlprofilerruncontrol.h>
 
 namespace QmlProfiler {
 namespace Internal {

src/plugins/qmlprofiler/tests/qmlprofilerclientmanager_test.cpp

@@ -3,7 +3,6 @@
 
 #include "qmlprofilerclientmanager_test.h"
 #include "fakedebugserver.h"
-#include <qmlprofiler/qmlprofilerruncontrol.h>
 #include <utils/url.h>
 
 #include <QTcpServer>

src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp

@@ -11,7 +11,6 @@
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 

src/plugins/qnx/qnxrunconfiguration.cpp

@@ -10,7 +10,6 @@
 #include <projectexplorer/deployablefile.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/runconfigurationaspects.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <remotelinux/remotelinuxenvironmentaspect.h>

src/plugins/qtsupport/qtsupportplugin.cpp

@@ -24,7 +24,6 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projecttree.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
 

src/plugins/remotelinux/linuxdevice.cpp

@@ -22,7 +22,6 @@
 #include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
 #include <projectexplorer/devicesupport/sshparameters.h>
 #include <projectexplorer/devicesupport/sshsettings.h>
-#include <projectexplorer/runcontrol.h>
 
 #include <utils/algorithm.h>
 #include <utils/devicefileaccess.h>

src/plugins/remotelinux/remotelinuxenvironmentreader.cpp

@@ -6,7 +6,6 @@
 #include "remotelinuxtr.h"
 
 #include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/runcontrol.h>
 
 #include <utils/qtcprocess.h>
 #include <utils/stringutils.h>

src/plugins/valgrind/valgrindmemcheckparsertest.cpp

@@ -10,6 +10,7 @@
 
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/runcontrol.h>
 
 #include <QFile>
 #include <QFileInfo>

src/plugins/valgrind/valgrindrunner.cpp

@@ -6,6 +6,8 @@
 #include "valgrindtr.h"
 #include "xmlprotocol/threadedparser.h"
 
+#include <projectexplorer/runcontrol.h>
+
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>

src/plugins/valgrind/valgrindrunner.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <projectexplorer/runcontrol.h>
-
 #include <utils/outputformat.h>
 
 #include <QProcess>
@@ -13,6 +11,9 @@ QT_BEGIN_NAMESPACE
 class QHostAddress;
 QT_END_NAMESPACE
 
+namespace Utils { class CommandLine; }
+namespace ProjectExplorer { class Runnable; }
+
 namespace Valgrind {
 
 namespace XmlProtocol { class ThreadedParser; }

src/plugins/valgrind/valgrindtestrunnertest.cpp

@@ -5,14 +5,13 @@
 
 #include "xmlprotocol/frame.h"
 #include "xmlprotocol/stack.h"
-#include "xmlprotocol/suppression.h"
 #include "xmlprotocol/threadedparser.h"
-#include "xmlprotocol/parser.h"
 #include "valgrindrunner.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/runcontrol.h>
 
 #include <utils/algorithm.h>
 

src/plugins/webassembly/webassemblydevice.cpp

@@ -5,8 +5,6 @@
 #include "webassemblydevice.h"
 #include "webassemblytr.h"
 
-#include <projectexplorer/runcontrol.h>
-
 using namespace ProjectExplorer;
 using namespace Utils;
 

src/plugins/webassembly/webassemblyrunconfigurationaspects.cpp

@@ -5,10 +5,10 @@
 #include "webassemblytr.h"
 
 #include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 #include <utils/layoutbuilder.h>
+#include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
 #include <QComboBox>

tests/auto/valgrind/memcheck/modeldemo.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
+#include <utils/commandline.h>
 #include <utils/launcherinterface.h>
 #include <utils/temporarydirectory.h>