diff options
40 files changed, 103 insertions, 72 deletions
diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp index ba40457e1ea..0c37cdce471 100644 --- a/src/plugins/autotest/autotestplugin.cpp +++ b/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 diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp index 218fb22d70b..34b368cc1df 100644 --- a/src/plugins/autotest/autotestunittests.cpp +++ b/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" diff --git a/src/plugins/autotest/boost/boosttestresult.cpp b/src/plugins/autotest/boost/boosttestresult.cpp index 29f2c8269d6..3094e9074b9 100644 --- a/src/plugins/autotest/boost/boosttestresult.cpp +++ b/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 { diff --git a/src/plugins/autotest/catch/catchresult.cpp b/src/plugins/autotest/catch/catchresult.cpp index 082d7c00df1..03438d1311d 100644 --- a/src/plugins/autotest/catch/catchresult.cpp +++ b/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 { diff --git a/src/plugins/autotest/gtest/gtestresult.cpp b/src/plugins/autotest/gtest/gtestresult.cpp index 9f909a9de2c..ce0481b95a5 100644 --- a/src/plugins/autotest/gtest/gtestresult.cpp +++ b/src/plugins/autotest/gtest/gtestresult.cpp @@ -29,6 +29,7 @@ #include "../testtreeitem.h" #include <utils/id.h> +#include <utils/qtcassert.h> #include <QRegularExpression> diff --git a/src/plugins/autotest/gtest/gtestsettingspage.cpp b/src/plugins/autotest/gtest/gtestsettingspage.cpp index d3f94c671f3..3bd28433ad7 100644 --- a/src/plugins/autotest/gtest/gtestsettingspage.cpp +++ b/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> diff --git a/src/plugins/autotest/itestframework.cpp b/src/plugins/autotest/itestframework.cpp index 37172d91c83..3b8db6b4a94 100644 --- a/src/plugins/autotest/itestframework.cpp +++ b/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) diff --git a/src/plugins/autotest/itestframework.h b/src/plugins/autotest/itestframework.h index 121b7240dce..1d1f66edd62 100644 --- a/src/plugins/autotest/itestframework.h +++ b/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 { diff --git a/src/plugins/autotest/itestparser.h b/src/plugins/autotest/itestparser.h index 02f343f2cd3..d8a217bf5f6 100644 --- a/src/plugins/autotest/itestparser.h +++ b/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; diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp index 9706fa7e261..42e79b1b1d1 100644 --- a/src/plugins/autotest/projectsettingswidget.cpp +++ b/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> diff --git a/src/plugins/autotest/qtest/qttest_utils.cpp b/src/plugins/autotest/qtest/qttest_utils.cpp index 6cf5fd679c5..916a83aa060 100644 --- a/src/plugins/autotest/qtest/qttest_utils.cpp +++ b/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> diff --git a/src/plugins/autotest/quick/quicktestframework.cpp b/src/plugins/autotest/quick/quicktestframework.cpp index 7b60c661f49..416fbc25d70 100644 --- a/src/plugins/autotest/quick/quicktestframework.cpp +++ b/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" diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index e3c185ed63a..c5b8809cce4 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/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> diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index 1ef39f2ccf5..1382d807d3e 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/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> diff --git a/src/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h index ad1788221fd..60a621ef3bf 100644 --- a/src/plugins/autotest/testcodeparser.h +++ b/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; diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 785abe4f753..61de8a6720c 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "testconfiguration.h" + #include "testoutputreader.h" #include "testrunconfiguration.h" diff --git a/src/plugins/autotest/testconfiguration.h b/src/plugins/autotest/testconfiguration.h index 2c8d4046a71..842ef50f43c 100644 --- a/src/plugins/autotest/testconfiguration.h +++ b/src/plugins/autotest/testconfiguration.h @@ -32,7 +32,6 @@ #include <utils/environment.h> #include <QFutureInterface> -#include <QObject> #include <QPointer> #include <QStringList> diff --git a/src/plugins/autotest/testeditormark.cpp b/src/plugins/autotest/testeditormark.cpp index 16602cd8e53..7292016b31f 100644 --- a/src/plugins/autotest/testeditormark.cpp +++ b/src/plugins/autotest/testeditormark.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "testeditormark.h" + #include "testresultspane.h" namespace Autotest { diff --git a/src/plugins/autotest/testframeworkmanager.cpp b/src/plugins/autotest/testframeworkmanager.cpp index de54b1a14ed..9da8730a4bf 100644 --- a/src/plugins/autotest/testframeworkmanager.cpp +++ b/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 { diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index 31b0c6749bf..9c0a8255afa 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/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 <utils/progressindicator.h> -#include <utils/utilsicons.h> -#include <coreplugin/actionmanager/actionmanager.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 <QAction> #include <QMenu> diff --git a/src/plugins/autotest/testnavigationwidget.h b/src/plugins/autotest/testnavigationwidget.h index f01bb6c3d5d..f2fb9caae39 100644 --- a/src/plugins/autotest/testnavigationwidget.h +++ b/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; diff --git a/src/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp index 3faa7282f35..930f55697db 100644 --- a/src/plugins/autotest/testoutputreader.cpp +++ b/src/plugins/autotest/testoutputreader.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "testoutputreader.h" + #include "testresult.h" #include "testresultspane.h" diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp index 61a2c99b4de..14d55d16c78 100644 --- a/src/plugins/autotest/testprojectsettings.cpp +++ b/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 { diff --git a/src/plugins/autotest/testprojectsettings.h b/src/plugins/autotest/testprojectsettings.h index 7f7332197e2..278b5a48135 100644 --- a/src/plugins/autotest/testprojectsettings.h +++ b/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 { diff --git a/src/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h index 91ae196f8fd..6bdcaa57483 100644 --- a/src/plugins/autotest/testresult.h +++ b/src/plugins/autotest/testresult.h @@ -27,10 +27,10 @@ #include "autotestconstants.h" -#include <QString> #include <QColor> #include <QMetaType> #include <QSharedPointer> +#include <QString> namespace Autotest { diff --git a/src/plugins/autotest/testresultdelegate.cpp b/src/plugins/autotest/testresultdelegate.cpp index 09c44083e82..a439c58a5c9 100644 --- a/src/plugins/autotest/testresultdelegate.cpp +++ b/src/plugins/autotest/testresultdelegate.cpp @@ -23,8 +23,9 @@ ** ****************************************************************************/ -#include "autotestplugin.h" #include "testresultdelegate.h" + +#include "autotestplugin.h" #include "testresultmodel.h" #include "testsettings.h" diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index f91ad9e097b..6c0c68cc279 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "testresultmodel.h" + #include "autotesticons.h" #include "autotestplugin.h" #include "testresultdelegate.h" diff --git a/src/plugins/autotest/testresultmodel.h b/src/plugins/autotest/testresultmodel.h index 6370296ac04..54258c6159c 100644 --- a/src/plugins/autotest/testresultmodel.h +++ b/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> diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index 8a6ef9022d6..b693e5032b5 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/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> diff --git a/src/plugins/autotest/testrunconfiguration.h b/src/plugins/autotest/testrunconfiguration.h index a087fa461f4..7e88eb6ce86 100644 --- a/src/plugins/autotest/testrunconfiguration.h +++ b/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> diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 37fc75f464f..89c8db6d170 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/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" diff --git a/src/plugins/autotest/testrunner.h b/src/plugins/autotest/testrunner.h index 52e11d5e205..5fa4f34eed5 100644 --- a/src/plugins/autotest/testrunner.h +++ b/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 { diff --git a/src/plugins/autotest/testsettings.cpp b/src/plugins/autotest/testsettings.cpp index fffeaece488..24b2c43fef4 100644 --- a/src/plugins/autotest/testsettings.cpp +++ b/src/plugins/autotest/testsettings.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "testsettings.h" + #include "autotestconstants.h" #include "testframeworkmanager.h" diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp index c988e1b2085..ff04a103c26 100644 --- a/src/plugins/autotest/testsettingspage.cpp +++ b/src/plugins/autotest/testsettingspage.cpp @@ -23,15 +23,17 @@ ** ****************************************************************************/ +#include "testsettingspage.h" + #include "autotestconstants.h" -#include "testcodeparser.h" +#include "autotestplugin.h" #include "testframeworkmanager.h" -#include "testsettingspage.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> diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index ba0365ae1a8..d085f12a35a 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/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> diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index a434cf2c14d..ac45a5c8f36 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/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 { diff --git a/src/plugins/autotest/testtreeitemdelegate.cpp b/src/plugins/autotest/testtreeitemdelegate.cpp index 2a1aeea0f45..b0f730dbae3 100644 --- a/src/plugins/autotest/testtreeitemdelegate.cpp +++ b/src/plugins/autotest/testtreeitemdelegate.cpp @@ -23,9 +23,10 @@ ** ****************************************************************************/ -#include "testtreeitem.h" #include "testtreeitemdelegate.h" +#include "testtreeitem.h" + #include <QPainter> namespace Autotest { diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 467786b9fbc..ff74b0eed70 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/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; diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index 1ce10d29811..9ec8c4f6efc 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/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> diff --git a/src/plugins/autotest/testtreeview.cpp b/src/plugins/autotest/testtreeview.cpp index c8ae2cee074..3c765cf093a 100644 --- a/src/plugins/autotest/testtreeview.cpp +++ b/src/plugins/autotest/testtreeview.cpp @@ -23,12 +23,11 @@ ** ****************************************************************************/ +#include "testtreeview.h" + #include "autotestconstants.h" -#include "testtreeitem.h" #include "testtreemodel.h" -#include "testtreeview.h" -#include <coreplugin/coreconstants.h> #include <coreplugin/icontext.h> #include <coreplugin/icore.h> |