AutoTest: Clean up header mess

Better decoupling and reduced binary size.

Change-Id: I4f6239979d9d7dae4ad92f19ec8420be38372c07
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/autotest/autotestplugin.cpp

@@ -24,54 +24,56 @@
 ****************************************************************************/
 
 #include "autotestplugin.h"
+
 #include "autotestconstants.h"
 #include "autotesticons.h"
 #include "projectsettingswidget.h"
 #include "testcodeparser.h"
 #include "testframeworkmanager.h"
+#include "testnavigationwidget.h"
 #include "testprojectsettings.h"
+#include "testresultspane.h"
 #include "testrunner.h"
 #include "testsettings.h"
 #include "testsettingspage.h"
 #include "testtreeitem.h"
-#include "testtreeview.h"
 #include "testtreemodel.h"
-#include "testresultspane.h"
-#include "testnavigationwidget.h"
+#include "testtreeview.h"
 
-#include "qtest/qttestframework.h"
-#include "quick/quicktestframework.h"
-#include "gtest/gtestframework.h"
 #include "boost/boosttestframework.h"
 #include "catch/catchframework.h"
+#include "gtest/gtestframework.h"
+#include "qtest/qttestframework.h"
+#include "quick/quicktestframework.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/icontext.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorericons.h>
 #include <projectexplorer/projectpanelfactory.h>
-#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/runcontrol.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
-#include <texteditor/texteditor.h>
 #include <texteditor/textdocument.h>
+#include <texteditor/texteditor.h>
 #include <utils/textutils.h>
 #include <utils/utilsicons.h>
 
 #include <QAction>
 #include <QList>
-#include <QMap>
-#include <QMessageBox>
 #include <QMainWindow>
+#include <QMap>
 #include <QMenu>
+#include <QMessageBox>
 #include <QTextCursor>
 
 #ifdef WITH_TESTS

src/plugins/autotest/autotestunittests.cpp

@@ -23,9 +23,9 @@
 **
 ****************************************************************************/
 
+#include "autotestunittests.h"
 #include "autotestconstants.h"
 #include "autotestplugin.h"
-#include "autotestunittests.h"
 #include "testcodeparser.h"
 #include "testsettings.h"
 #include "testtreemodel.h"

src/plugins/autotest/boost/boosttestresult.cpp

@@ -29,6 +29,7 @@
 #include "../testframeworkmanager.h"
 
 #include <utils/id.h>
+#include <utils/qtcassert.h>
 
 namespace Autotest {
 namespace Internal {

src/plugins/autotest/catch/catchresult.cpp

@@ -28,6 +28,7 @@
 #include "../testframeworkmanager.h"
 
 #include <utils/id.h>
+#include <utils/qtcassert.h>
 
 namespace Autotest {
 namespace Internal {

src/plugins/autotest/gtest/gtestresult.cpp

@@ -29,6 +29,7 @@
 #include "../testtreeitem.h"
 
 #include <utils/id.h>
+#include <utils/qtcassert.h>
 
 #include <QRegularExpression>
 

src/plugins/autotest/gtest/gtestsettingspage.cpp

@@ -29,6 +29,7 @@
 #include "gtest_utils.h"
 #include "../autotestconstants.h"
 #include "../testframeworkmanager.h"
+#include "../testtreemodel.h"
 
 #include "ui_gtestsettingspage.h"
 #include <coreplugin/icore.h>

src/plugins/autotest/itestframework.cpp

@@ -25,6 +25,11 @@
 
 #include "itestframework.h"
 
+#include "autotestconstants.h"
+#include "itestparser.h"
+#include "testtreeitem.h"
+#include "testtreemodel.h"
+
 namespace Autotest {
 
 ITestBase::ITestBase(bool activeByDefault)

src/plugins/autotest/itestframework.h

@@ -25,12 +25,13 @@
 
 #pragma once
 
-#include "testtreeitem.h"
-#include "itestparser.h"
+#include <utils/id.h>
 
 namespace Autotest {
 
+class ITestParser;
 class ITestSettings;
+class TestTreeItem;
 
 class ITestBase
 {

src/plugins/autotest/itestparser.h

@@ -26,13 +26,13 @@
 #pragma once
 
 #include "testtreeitem.h"
-#include "testtreemodel.h"
 
-#include <utils/id.h>
 #include <cplusplus/CppDocument.h>
 #include <cpptools/cppworkingcopy.h>
 #include <qmljs/qmljsdocument.h>
 
+#include <QFutureInterface>
+
 namespace Autotest {
 
 class ITestBase;

src/plugins/autotest/projectsettingswidget.cpp

@@ -23,10 +23,14 @@
 **
 ****************************************************************************/
 
-#include "autotestplugin.h"
 #include "projectsettingswidget.h"
+
+#include "autotestplugin.h"
 #include "testframeworkmanager.h"
 #include "testprojectsettings.h"
+#include "testtreemodel.h"
+
+#include <utils/algorithm.h>
 
 #include <QBoxLayout>
 #include <QComboBox>

src/plugins/autotest/qtest/qttest_utils.cpp

@@ -30,6 +30,7 @@
 #include "../testsettings.h"
 
 #include <utils/algorithm.h>
+#include <utils/environment.h>
 #include <utils/qtcassert.h>
 
 #include <QByteArrayList>

src/plugins/autotest/quick/quicktestframework.cpp

@@ -27,6 +27,7 @@
 #include "quicktestparser.h"
 #include "quicktesttreeitem.h"
 
+#include "../autotestconstants.h"
 #include "../testframeworkmanager.h"
 #include "../qtest/qttestconstants.h"
 

src/plugins/autotest/quick/quicktestparser.cpp

@@ -29,6 +29,7 @@
 #include "quicktestvisitors.h"
 #include "quicktest_utils.h"
 #include "../testcodeparser.h"
+#include "../testtreemodel.h"
 
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/projectpart.h>

src/plugins/autotest/testcodeparser.cpp

@@ -23,17 +23,18 @@
 **
 ****************************************************************************/
 
-#include "autotestconstants.h"
-#include "autotestplugin.h"
 #include "testcodeparser.h"
+
+#include "autotestconstants.h"
 #include "testframeworkmanager.h"
 #include "testsettings.h"
+#include "testtreemodel.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cppmodelmanager.h>
+#include <cpptools/cpptoolsconstants.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
 #include <qmljstools/qmljsmodelmanager.h>
@@ -43,7 +44,6 @@
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
 
-#include <QDirIterator>
 #include <QFuture>
 #include <QFutureInterface>
 #include <QLoggingCategory>

src/plugins/autotest/testcodeparser.h

@@ -28,16 +28,19 @@
 #include "itestparser.h"
 
 #include <qmljs/qmljsdocument.h>
+#include <utils/id.h>
 
-#include <QObject>
-#include <QMap>
 #include <QFutureWatcher>
+#include <QMap>
+#include <QObject>
 #include <QTimer>
 
 QT_BEGIN_NAMESPACE
 class QThreadPool;
 QT_END_NAMESPACE
 
+namespace ProjectExplorer { class Project; }
+
 namespace Autotest {
 
 class ITestFramework;

src/plugins/autotest/testconfiguration.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "testconfiguration.h"
+
 #include "testoutputreader.h"
 #include "testrunconfiguration.h"
 

src/plugins/autotest/testconfiguration.h

@@ -32,7 +32,6 @@
 #include <utils/environment.h>
 
 #include <QFutureInterface>
-#include <QObject>
 #include <QPointer>
 #include <QStringList>
 

src/plugins/autotest/testeditormark.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "testeditormark.h"
+
 #include "testresultspane.h"
 
 namespace Autotest {

src/plugins/autotest/testframeworkmanager.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "testframeworkmanager.h"
+
 #include "autotestconstants.h"
 #include "autotestplugin.h"
 #include "itestsettings.h"
@@ -34,7 +35,6 @@
 
 #include <QSettings>
 
-using namespace Core;
 using namespace Utils;
 
 namespace Autotest {

src/plugins/autotest/testnavigationwidget.cpp

@@ -24,26 +24,28 @@
 ****************************************************************************/
 
 #include "testnavigationwidget.h"
-#include "testframeworkmanager.h"
-#include "testtreemodel.h"
-#include "testtreeview.h"
-#include "testtreeitemdelegate.h"
-#include "testcodeparser.h"
-#include "testrunner.h"
+
 #include "autotestconstants.h"
 #include "autotesticons.h"
+#include "testcodeparser.h"
+#include "testframeworkmanager.h"
+#include "testrunner.h"
 #include "testtreeitem.h"
+#include "testtreeitemdelegate.h"
+#include "testtreemodel.h"
+#include "testtreeview.h"
 
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/find/itemviewfind.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
-#include <texteditor/texteditor.h>
+#include <projectexplorer/buildmanager.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/session.h>
+#include <utils/algorithm.h>
+#include <utils/link.h>
 #include <utils/progressindicator.h>
 #include <utils/utilsicons.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <projectexplorer/buildmanager.h>
-#include <projectexplorer/session.h>
 
 #include <QAction>
 #include <QMenu>

src/plugins/autotest/testnavigationwidget.h

@@ -26,7 +26,6 @@
 #pragma once
 
 #include "itemdatacache.h"
-#include "testrunner.h"
 
 #include <coreplugin/inavigationwidgetfactory.h>
 
@@ -53,6 +52,7 @@ class TestTreeModel;
 
 namespace Internal {
 
+class TestRunner;
 class TestTreeSortFilterModel;
 class TestTreeView;
 

src/plugins/autotest/testoutputreader.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "testoutputreader.h"
+
 #include "testresult.h"
 #include "testresultspane.h"
 

src/plugins/autotest/testprojectsettings.cpp

@@ -24,12 +24,16 @@
 ****************************************************************************/
 
 #include "testprojectsettings.h"
+
 #include "autotestconstants.h"
 #include "testframeworkmanager.h"
 
+#include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
 #include <utils/algorithm.h>
 
+#include <QLoggingCategory>
+
 namespace Autotest {
 namespace Internal {
 

src/plugins/autotest/testprojectsettings.h

@@ -25,10 +25,10 @@
 
 #pragma once
 
+#include "itemdatacache.h"
 #include "testsettings.h"
-#include "testtreemodel.h"
 
-#include <projectexplorer/project.h>
+namespace ProjectExplorer { class Project; }
 
 namespace Autotest {
 

src/plugins/autotest/testresult.h

@@ -27,10 +27,10 @@
 
 #include "autotestconstants.h"
 
-#include <QString>
 #include <QColor>
 #include <QMetaType>
 #include <QSharedPointer>
+#include <QString>
 
 namespace Autotest {
 

src/plugins/autotest/testresultdelegate.cpp

@@ -23,8 +23,9 @@
 **
 ****************************************************************************/
 
-#include "autotestplugin.h"
 #include "testresultdelegate.h"
+
+#include "autotestplugin.h"
 #include "testresultmodel.h"
 #include "testsettings.h"
 

src/plugins/autotest/testresultmodel.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "testresultmodel.h"
+
 #include "autotesticons.h"
 #include "autotestplugin.h"
 #include "testresultdelegate.h"

src/plugins/autotest/testresultmodel.h

@@ -28,9 +28,9 @@
 #include "testresult.h"
 
 #include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
 #include <QFont>
 #include <QSet>
+#include <QSortFilterProxyModel>
 
 #include <utils/optional.h>
 #include <utils/treemodel.h>

src/plugins/autotest/testresultspane.cpp

@@ -23,17 +23,16 @@
 **
 ****************************************************************************/
 
-#include "autotestplugin.h"
-#include "autotesticons.h"
 #include "testresultspane.h"
-#include "testresultmodel.h"
+
+#include "autotesticons.h"
+#include "autotestplugin.h"
+#include "testeditormark.h"
 #include "testresultdelegate.h"
+#include "testresultmodel.h"
 #include "testrunner.h"
 #include "testsettings.h"
 #include "testtreemodel.h"
-#include "testcodeparser.h"
-#include "testeditormark.h"
-#include "testoutputreader.h"
 
 #include <aggregation/aggregate.h>
 #include <coreplugin/actionmanager/actionmanager.h>

src/plugins/autotest/testrunconfiguration.h

@@ -25,15 +25,13 @@
 
 #pragma once
 
-#include "autotestplugin.h"
 #include "testconfiguration.h"
 
 #include <debugger/debuggerrunconfigurationaspect.h>
 
-#include <projectexplorer/applicationlauncher.h>
+#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/runconfiguration.h>
 
 #include <utils/qtcassert.h>

src/plugins/autotest/testrunner.cpp

@@ -27,11 +27,11 @@
 
 #include "autotestconstants.h"
 #include "autotestplugin.h"
+#include "testoutputreader.h"
 #include "testprojectsettings.h"
 #include "testresultspane.h"
 #include "testrunconfiguration.h"
 #include "testsettings.h"
-#include "testoutputreader.h"
 #include "testtreeitem.h"
 #include "testtreemodel.h"
 

src/plugins/autotest/testrunner.h

@@ -26,8 +26,6 @@
 #pragma once
 
 #include "autotest_global.h"
-
-#include "testconfiguration.h"
 #include "testresult.h"
 
 #include <QDialog>
@@ -43,13 +41,13 @@ class QLabel;
 class QProcess;
 QT_END_NAMESPACE
 
-namespace ProjectExplorer {
-class Project;
-}
+namespace ProjectExplorer { class Project; }
 
 namespace Autotest {
 
 enum class TestRunMode;
+class TestConfiguration;
+class TestOutputReader;
 
 namespace Internal {
 

src/plugins/autotest/testsettings.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "testsettings.h"
+
 #include "autotestconstants.h"
 #include "testframeworkmanager.h"
 

src/plugins/autotest/testsettingspage.cpp

@@ -23,15 +23,17 @@
 **
 ****************************************************************************/
 
-#include "autotestconstants.h"
-#include "testcodeparser.h"
-#include "testframeworkmanager.h"
 #include "testsettingspage.h"
+
+#include "autotestconstants.h"
+#include "autotestplugin.h"
+#include "testframeworkmanager.h"
 #include "testsettings.h"
 #include "testtreemodel.h"
-#include "autotestplugin.h"
 
 #include <coreplugin/icore.h>
+#include <utils/algorithm.h>
+#include <utils/id.h>
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
 

src/plugins/autotest/testtreeitem.cpp

@@ -23,11 +23,12 @@
 **
 ****************************************************************************/
 
+#include "testtreeitem.h"
+
 #include "autotestconstants.h"
 #include "itestframework.h"
 #include "itestparser.h"
 #include "testconfiguration.h"
-#include "testtreeitem.h"
 
 #include <cplusplus/Icons.h>
 #include <cpptools/cppmodelmanager.h>

src/plugins/autotest/testtreeitem.h

@@ -28,9 +28,9 @@
 #include <utils/treemodel.h>
 
 #include <QList>
+#include <QMetaType>
 #include <QSet>
 #include <QString>
-#include <QMetaType>
 
 namespace {
     enum ItemRole {

src/plugins/autotest/testtreeitemdelegate.cpp

@@ -23,9 +23,10 @@
 **
 ****************************************************************************/
 
-#include "testtreeitem.h"
 #include "testtreeitemdelegate.h"
 
+#include "testtreeitem.h"
+
 #include <QPainter>
 
 namespace Autotest {

src/plugins/autotest/testtreemodel.cpp

@@ -23,20 +23,21 @@
 **
 ****************************************************************************/
 
+#include "testtreemodel.h"
+
 #include "autotestconstants.h"
 #include "autotestplugin.h"
 #include "testcodeparser.h"
 #include "testframeworkmanager.h"
 #include "testprojectsettings.h"
 #include "testsettings.h"
-#include "testtreeitem.h"
-#include "testtreemodel.h"
 
 #include <cpptools/cppmodelmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/session.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <texteditor/texteditor.h>
+#include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;

src/plugins/autotest/testtreemodel.h

@@ -28,10 +28,9 @@
 #include "autotest_global.h"
 
 #include "itemdatacache.h"
-#include "testconfiguration.h"
 #include "testtreeitem.h"
 
-#include <utils/algorithm.h>
+#include <utils/id.h>
 #include <utils/treemodel.h>
 
 #include <QSortFilterProxyModel>

src/plugins/autotest/testtreeview.cpp

@@ -23,12 +23,11 @@
 **
 ****************************************************************************/
 
-#include "autotestconstants.h"
-#include "testtreeitem.h"
-#include "testtreemodel.h"
 #include "testtreeview.h"
 
-#include <coreplugin/coreconstants.h>
+#include "autotestconstants.h"
+#include "testtreemodel.h"
+
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>