AutoTest: Merge settings and tools hierarchies [2/2]

Renaming files to match class names.

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

src/plugins/autotest/CMakeLists.txt

@@ -13,27 +13,27 @@ add_qtc_plugin(AutoTest
     boost/boostcodeparser.cpp boost/boostcodeparser.h
     boost/boosttestconfiguration.cpp boost/boosttestconfiguration.h
     boost/boosttestconstants.h
+    boost/boosttestframework.cpp boost/boosttestframework.h
     boost/boosttestoutputreader.cpp boost/boosttestoutputreader.h
     boost/boosttestparser.cpp boost/boosttestparser.h
     boost/boosttestresult.cpp boost/boosttestresult.h
-    boost/boosttestsettings.cpp boost/boosttestsettings.h
     boost/boosttesttreeitem.cpp boost/boosttesttreeitem.h
     catch/catchcodeparser.cpp catch/catchcodeparser.h
     catch/catchconfiguration.cpp catch/catchconfiguration.h
     catch/catchoutputreader.cpp catch/catchresult.h catch/catchresult.cpp catch/catchtestparser.h
+    catch/catchtestframework.cpp catch/catchtestframework.h
     catch/catchtestparser.cpp catch/catchtreeitem.h catch/catchtreeitem.cpp
-    catch/catchtestsettings.cpp catch/catchtestsettings.h
     ctest/ctestconfiguration.cpp ctest/ctestconfiguration.h
     ctest/ctestoutputreader.cpp ctest/ctestoutputreader.h
-    ctest/ctestsettings.cpp ctest/ctestsettings.h
+    ctest/ctesttool.cpp ctest/ctesttool.h
     ctest/ctesttreeitem.cpp ctest/ctesttreeitem.h
     gtest/gtest_utils.cpp gtest/gtest_utils.h
     gtest/gtestconfiguration.cpp gtest/gtestconfiguration.h
     gtest/gtestconstants.h
+    gtest/gtestframework.cpp gtest/gtestframework.h
     gtest/gtestoutputreader.cpp gtest/gtestoutputreader.h
     gtest/gtestparser.cpp gtest/gtestparser.h
     gtest/gtestresult.cpp gtest/gtestresult.h
-    gtest/gtestsettings.cpp gtest/gtestsettings.h
     gtest/gtesttreeitem.cpp gtest/gtesttreeitem.h
     gtest/gtestvisitors.cpp gtest/gtestvisitors.h
     itemdatacache.h
@@ -43,10 +43,10 @@ add_qtc_plugin(AutoTest
     qtest/qttest_utils.cpp qtest/qttest_utils.h
     qtest/qttestconfiguration.cpp qtest/qttestconfiguration.h
     qtest/qttestconstants.h
+    qtest/qttestframework.cpp qtest/qttestframework.h
     qtest/qttestoutputreader.cpp qtest/qttestoutputreader.h
     qtest/qttestparser.cpp qtest/qttestparser.h
     qtest/qttestresult.cpp qtest/qttestresult.h
-    qtest/qttestsettings.cpp qtest/qttestsettings.h
     qtest/qttesttreeitem.cpp qtest/qttesttreeitem.h
     qtest/qttestvisitors.cpp qtest/qttestvisitors.h
     quick/quicktest_utils.cpp quick/quicktest_utils.h

src/plugins/autotest/autotestplugin.cpp

@@ -18,11 +18,11 @@
 #include "testtreeitem.h"
 #include "testtreemodel.h"
 
-#include "boost/boosttestsettings.h"
+#include "boost/boosttestframework.h"
-#include "catch/catchtestsettings.h"
+#include "catch/catchtestframework.h"
-#include "ctest/ctestsettings.h"
+#include "ctest/ctesttool.h"
-#include "gtest/gtestsettings.h"
+#include "gtest/gtestframework.h"
-#include "qtest/qttestsettings.h"
+#include "qtest/qttestframework.h"
 #include "quick/quicktestframework.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>

src/plugins/autotest/autotestunittests.cpp

@@ -7,7 +7,7 @@
 #include "testframeworkmanager.h"
 #include "testtreemodel.h"
 
-#include "qtest/qttestsettings.h"
+#include "qtest/qttestframework.h"
 
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/cpptoolstestcase.h>
@@ -20,6 +20,8 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/toolchain.h>
 
+#include <qtsupport/qtkitinformation.h>
+
 #include <utils/environment.h>
 
 #include <QFileInfo>
@@ -27,8 +29,6 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include <qtsupport/qtkitinformation.h>
-
 using namespace Core;
 using namespace ExtensionSystem;
 using namespace ProjectExplorer;

src/plugins/autotest/boost/boosttestconfiguration.cpp

@@ -3,10 +3,9 @@
 
 #include "boosttestconfiguration.h"
 
+#include "boosttestframework.h"
 #include "boosttestoutputreader.h"
-#include "boosttestsettings.h"
 
-#include "../itestframework.h"
 #include "../testsettings.h"
 
 #include <utils/algorithm.h>

src/plugins/autotest/boost/boosttestframework.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "boosttestsettings.h"
+#include "boosttestframework.h"
 
 #include "boosttestconstants.h"
 #include "boosttesttreeitem.h"

src/plugins/autotest/boost/boosttestoutputreader.cpp

@@ -3,7 +3,7 @@
 
 #include "boosttestoutputreader.h"
 
-#include "boosttestsettings.h"
+#include "boosttestframework.h"
 #include "boosttestresult.h"
 
 #include "../autotesttr.h"

src/plugins/autotest/catch/catchconfiguration.cpp

@@ -3,10 +3,9 @@
 
 #include "catchconfiguration.h"
 
+#include "catchtestframework.h"
 #include "catchoutputreader.h"
-#include "catchtestsettings.h"
 
-#include "../itestframework.h"
 #include "../testsettings.h"
 
 using namespace Utils;

src/plugins/autotest/catch/catchtestframework.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "catchtestsettings.h"
+#include "catchtestframework.h"
 
 #include "catchtestparser.h"
 #include "catchtreeitem.h"

src/plugins/autotest/catch/catchtestparser.cpp

@@ -4,11 +4,12 @@
 #include "catchtestparser.h"
 
 #include "catchcodeparser.h"
-#include "catchtestsettings.h"
+#include "catchtestframework.h"
 #include "catchtreeitem.h"
 
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/projectpart.h>
+
 #include <utils/qtcassert.h>
 
 #include <QPromise>

src/plugins/autotest/ctest/ctesttool.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "ctestsettings.h"
+#include "ctesttool.h"
 
 #include "ctesttreeitem.h"
 #include "../autotestconstants.h"

src/plugins/autotest/ctest/ctesttreeitem.cpp

@@ -4,10 +4,9 @@
 #include "ctesttreeitem.h"
 
 #include "ctestconfiguration.h"
-#include "ctestsettings.h"
+#include "ctesttool.h"
 
 #include "../autotestplugin.h"
-#include "../itestframework.h"
 #include "../testsettings.h"
 
 #include <projectexplorer/buildconfiguration.h>

src/plugins/autotest/gtest/gtestconfiguration.cpp

@@ -3,10 +3,9 @@
 
 #include "gtestconfiguration.h"
 
+#include "gtestframework.h"
 #include "gtestoutputreader.h"
-#include "gtestsettings.h"
 
-#include "../itestframework.h"
 #include "../testsettings.h"
 
 #include <utils/algorithm.h>

src/plugins/autotest/gtest/gtestframework.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "gtestsettings.h"
+#include "gtestframework.h"
 
 #include "gtest_utils.h"
 #include "gtesttreeitem.h"

src/plugins/autotest/gtest/gtesttreeitem.cpp

@@ -5,7 +5,7 @@
 
 #include "gtestconfiguration.h"
 #include "gtestconstants.h"
-#include "gtestsettings.h"
+#include "gtestframework.h"
 #include "gtestparser.h"
 #include "../autotesttr.h"
 

src/plugins/autotest/qtest/qttestconfiguration.cpp

@@ -3,11 +3,10 @@
 
 #include "qttestconfiguration.h"
 
+#include "qttestframework.h"
 #include "qttestoutputreader.h"
-#include "qttestsettings.h"
 #include "qttest_utils.h"
 
-#include "../itestframework.h"
 #include "../testsettings.h"
 
 #include <utils/algorithm.h>

src/plugins/autotest/qtest/qttestframework.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "qttestsettings.h"
+#include "qttestframework.h"
 
 #include "../autotestconstants.h"
 #include "../autotesttr.h"

src/plugins/autotest/quick/quicktestconfiguration.cpp

@@ -3,9 +3,8 @@
 
 #include "quicktestconfiguration.h"
 
-#include "../itestframework.h"
 #include "../qtest/qttestoutputreader.h"
-#include "../qtest/qttestsettings.h"
+#include "../qtest/qttestframework.h"
 #include "../qtest/qttest_utils.h"
 #include "../testsettings.h"
 

src/plugins/autotest/quick/quicktestframework.h

@@ -5,7 +5,7 @@
 
 #include "../itestframework.h"
 
-#include "../qtest/qttestsettings.h"
+#include "../qtest/qttestframework.h"
 
 namespace Autotest {
 namespace QuickTest {

src/plugins/autotest/quick/quicktestparser.cpp

@@ -8,7 +8,7 @@
 #include "quicktest_utils.h"
 #include "../testcodeparser.h"
 #include "../testtreemodel.h"
-#include "../qtest/qttestsettings.h"
+#include "../qtest/qttestframework.h"
 
 #include <cppeditor/cppmodelmanager.h>
 #include <cppeditor/projectpart.h>