Meson: Flatten directory hierarchy

Keep tests/ and icons/ but put the rest into the toplevel.

The previous setup was so different from the rest of the bunch that
it regularly stuck out in maintenance tasks.

Change-Id: I69821be6268f69682353a388f6bb1fa343215303
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/mesonprojectmanager/CMakeLists.txt

@@ -6,80 +6,80 @@ add_qtc_plugin(MesonProjectManager
   mesonprojectplugin.cpp
   mesonprojectplugin.h
   versionhelper.h
-  mesonactionsmanager/mesonactionsmanager.h
-  mesonactionsmanager/mesonactionsmanager.cpp
-  settings/tools/toolsmodel.cpp
-  settings/tools/toolssettingswidget.h
-  settings/tools/toolssettingswidget.cpp
-  settings/tools/toolssettingspage.cpp
-  settings/tools/toolssettingspage.h
-  settings/tools/toolitemsettings.cpp
-  settings/tools/toolitemsettings.h
-  settings/tools/tooltreeitem.cpp
-  settings/tools/tooltreeitem.h
-  settings/tools/toolsmodel.h
-  settings/tools/kitaspect/ninjatoolkitaspect.cpp
-  settings/tools/kitaspect/ninjatoolkitaspect.h
-  settings/tools/kitaspect/toolkitaspectwidget.h
-  settings/tools/kitaspect/toolkitaspectwidget.cpp
-  settings/tools/kitaspect/mesontoolkitaspect.cpp
-  settings/tools/kitaspect/mesontoolkitaspect.h
-  settings/tools/toolssettingsaccessor.h
-  settings/tools/toolssettingsaccessor.cpp
-  settings/general/settings.h
-  settings/general/settings.cpp
-  exewrappers/mesonwrapper.cpp
-  exewrappers/mesonwrapper.h
-  exewrappers/ninjawrapper.h
-  exewrappers/toolwrapper.h
-  exewrappers/toolwrapper.cpp
-  exewrappers/mesontools.h
-  exewrappers/mesontools.cpp
-  mesoninfoparser/mesoninfoparser.h
-  mesoninfoparser/buildoptions.h
-  mesoninfoparser/target.h
-  mesoninfoparser/mesoninfo.h
-  mesoninfoparser/parsers/common.h
-  mesoninfoparser/parsers/buildoptionsparser.h
-  mesoninfoparser/parsers/buildsystemfilesparser.h
-  mesoninfoparser/parsers/infoparser.h
-  mesoninfoparser/parsers/targetparser.h
-  kithelper/kitdata.h
-  kithelper/kithelper.h
-  project/mesonproject.h
-  project/mesonproject.cpp
-  project/mesonprojectimporter.h
-  project/mesonprojectimporter.cpp
-  project/mesonbuildsystem.h
-  project/mesonbuildsystem.cpp
-  project/mesonprojectparser.h
-  project/mesonprojectparser.cpp
-  project/mesonbuildconfiguration.h
-  project/mesonbuildconfiguration.cpp
-  project/ninjabuildstep.h
-  project/ninjabuildstep.cpp
-  project/buildoptions/mesonbuildsettingswidget.h
-  project/buildoptions/mesonbuildsettingswidget.cpp
-  project/buildoptions/optionsmodel/buildoptionsmodel.h
-  project/buildoptions/optionsmodel/buildoptionsmodel.cpp
-  project/buildoptions/optionsmodel/arrayoptionlineedit.cpp
-  project/buildoptions/optionsmodel/arrayoptionlineedit.h
-  project/mesonprocess.h
-  project/mesonprocess.cpp
-  project/outputparsers/mesonoutputparser.h
-  project/outputparsers/mesonoutputparser.cpp
-  project/outputparsers/ninjaparser.h
-  project/outputparsers/ninjaparser.cpp
-  project/mesonrunconfiguration.h
-  project/mesonrunconfiguration.cpp
-  project/projecttree/projecttree.h
-  project/projecttree/projecttree.cpp
-  project/projecttree/mesonprojectnodes.h
-  project/projecttree/mesonprojectnodes.cpp
-  machinefiles/machinefilemanager.h
-  machinefiles/machinefilemanager.cpp
-  machinefiles/nativefilegenerator.h
-  machinefiles/nativefilegenerator.cpp
+  mesonactionsmanager.h
+  mesonactionsmanager.cpp
+  toolsmodel.cpp
+  toolssettingswidget.h
+  toolssettingswidget.cpp
+  toolssettingspage.cpp
+  toolssettingspage.h
+  toolitemsettings.cpp
+  toolitemsettings.h
+  tooltreeitem.cpp
+  tooltreeitem.h
+  toolsmodel.h
+  ninjatoolkitaspect.cpp
+  ninjatoolkitaspect.h
+  toolkitaspectwidget.h
+  toolkitaspectwidget.cpp
+  mesontoolkitaspect.cpp
+  mesontoolkitaspect.h
+  toolssettingsaccessor.h
+  toolssettingsaccessor.cpp
+  settings.h
+  settings.cpp
+  mesonwrapper.cpp
+  mesonwrapper.h
+  ninjawrapper.h
+  toolwrapper.h
+  toolwrapper.cpp
+  mesontools.h
+  mesontools.cpp
+  mesoninfoparser.h
+  buildoptions.h
+  target.h
+  mesoninfo.h
+  common.h
+  buildoptionsparser.h
+  buildsystemfilesparser.h
+  infoparser.h
+  targetparser.h
+  kitdata.h
+  kithelper.h
+  mesonproject.h
+  mesonproject.cpp
+  mesonprojectimporter.h
+  mesonprojectimporter.cpp
+  mesonbuildsystem.h
+  mesonbuildsystem.cpp
+  mesonprojectparser.h
+  mesonprojectparser.cpp
+  mesonbuildconfiguration.h
+  mesonbuildconfiguration.cpp
+  ninjabuildstep.h
+  ninjabuildstep.cpp
+  mesonbuildsettingswidget.h
+  mesonbuildsettingswidget.cpp
+  buildoptionsmodel.h
+  buildoptionsmodel.cpp
+  arrayoptionlineedit.cpp
+  arrayoptionlineedit.h
+  mesonprocess.h
+  mesonprocess.cpp
+  mesonoutputparser.h
+  mesonoutputparser.cpp
+  ninjaparser.h
+  ninjaparser.cpp
+  mesonrunconfiguration.h
+  mesonrunconfiguration.cpp
+  projecttree.h
+  projecttree.cpp
+  mesonprojectnodes.h
+  mesonprojectnodes.cpp
+  machinefilemanager.h
+  machinefilemanager.cpp
+  nativefilegenerator.h
+  nativefilegenerator.cpp
   resources_meson.qrc
 )
 
@@ -100,12 +100,12 @@ add_qtc_test(tst_mesonwrapper
      TEST_RELATIVE_LIBEXEC_PATH="${TEST_RELATIVE_LIBEXEC_PATH}"
   SOURCES
     tests/testmesonwrapper.cpp
-    exewrappers/mesonwrapper.cpp
-    exewrappers/mesonwrapper.h
-    exewrappers/ninjawrapper.h
-    exewrappers/toolwrapper.h
-    exewrappers/toolwrapper.cpp
-    exewrappers/mesontools.h
+    mesonwrapper.cpp
+    mesonwrapper.h
+    ninjawrapper.h
+    toolwrapper.h
+    toolwrapper.cpp
+    mesontools.h
 )
 
 add_qtc_test(tst_mesoninfoparser
@@ -121,13 +121,13 @@ add_qtc_test(tst_mesoninfoparser
      TEST_RELATIVE_LIBEXEC_PATH="${TEST_RELATIVE_LIBEXEC_PATH}"
   SOURCES
     tests/testmesoninfoparser.cpp
-    exewrappers/mesonwrapper.cpp
-    exewrappers/mesonwrapper.h
-    exewrappers/ninjawrapper.h
-    exewrappers/toolwrapper.h
-    exewrappers/toolwrapper.cpp
-    exewrappers/mesontools.h
-    mesoninfoparser/mesoninfoparser.h
+    mesonwrapper.cpp
+    mesonwrapper.h
+    ninjawrapper.h
+    toolwrapper.h
+    toolwrapper.cpp
+    mesontools.h
+    mesoninfoparser.h
 )
 
 add_qtc_test(tst_ninjaparser
@@ -138,7 +138,7 @@ add_qtc_test(tst_ninjaparser
     Utils ProjectExplorer
   SOURCES
     tests/testninjaparser.cpp
-    project/outputparsers/ninjaparser.cpp
+    ninjaparser.cpp
 )
 
 add_qtc_test(tst_mesonparser
@@ -151,7 +151,7 @@ add_qtc_test(tst_mesonparser
     Utils ProjectExplorer
   SOURCES
     tests/testmesonparser.cpp
-    project/outputparsers/mesonoutputparser.cpp
+    mesonoutputparser.cpp
 )
 
 

src/plugins/mesonprojectmanager/buildoptionsmodel.cpp

@@ -4,6 +4,7 @@
 #include "buildoptionsmodel.h"
 
 #include "arrayoptionlineedit.h"
+#include "mesonprojectmanagertr.h"
 
 #include <QComboBox>
 #include <QLabel>
@@ -27,7 +28,7 @@ inline Utils::TreeItem *makeBuildOptionTreeItem(CancellableOption *buildOption)
 BuidOptionsModel::BuidOptionsModel(QObject *parent)
     : Utils::TreeModel<>(parent)
 {
-    setHeader({tr("Key"), tr("Value")});
+    setHeader({Tr::tr("Key"), Tr::tr("Value")});
 }
 
 inline void groupPerSubprojectAndSection(

src/plugins/mesonprojectmanager/buildoptionsmodel.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesoninfoparser.h"
 
 #include <utils/qtcassert.h>
 #include <utils/treemodel.h>

src/plugins/mesonprojectmanager/buildoptionsparser.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
-#include "../buildoptions.h"
+#include "buildoptions.h"
 #include "common.h"
+#include "mesonpluginconstants.h"
 
 #include <QFile>
 #include <QJsonArray>

src/plugins/mesonprojectmanager/buildsystemfilesparser.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
 #include "common.h"
+#include "mesonpluginconstants.h"
 
 #include <utils/fileutils.h>
 

src/plugins/mesonprojectmanager/infoparser.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
-#include "../mesoninfo.h"
+#include "mesoninfo.h"
+#include "mesonpluginconstants.h"
 
 #include <QFile>
 #include <QJsonArray>

src/plugins/mesonprojectmanager/machinefilemanager.cpp

@@ -3,8 +3,8 @@
 
 #include "machinefilemanager.h"
 
-#include "kithelper/kitdata.h"
-#include "kithelper/kithelper.h"
+#include "kitdata.h"
+#include "kithelper.h"
 #include "nativefilegenerator.h"
 
 #include <coreplugin/icore.h>

src/plugins/mesonprojectmanager/mesonactionsmanager.cpp

@@ -3,13 +3,14 @@
 
 #include "mesonactionsmanager.h"
 
+#include "mesonbuildsystem.h"
+#include "mesonprojectmanagertr.h"
+#include "mesonprojectnodes.h"
+
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 
-#include <project/mesonbuildsystem.h>
-#include <project/projecttree/mesonprojectnodes.h>
-
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projecttree.h>
@@ -20,8 +21,8 @@ namespace MesonProjectManager {
 namespace Internal {
 
 MesonActionsManager::MesonActionsManager()
-    : configureActionMenu(tr("Configure"))
-    , configureActionContextMenu(tr("Configure"))
+    : configureActionMenu(Tr::tr("Configure"))
+    , configureActionContextMenu(Tr::tr("Configure"))
 {
     const Core::Context globalContext(Core::Constants::C_GLOBAL);
     const Core::Context projectContext{Constants::Project::ID};

src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp

@@ -3,11 +3,11 @@
 
 #include "mesonbuildconfiguration.h"
 
-#include "buildoptions/mesonbuildsettingswidget.h"
-#include "exewrappers/mesonwrapper.h"
+#include "mesonbuildsettingswidget.h"
 #include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
 #include "mesonpluginconstants.h"
+#include "mesonwrapper.h"
 #include "ninjabuildstep.h"
 
 #include <projectexplorer/buildinfo.h>

src/plugins/mesonprojectmanager/mesonbuildconfiguration.h

@@ -4,8 +4,6 @@
 
 #include "projectexplorer/buildconfiguration.h"
 #include "projectexplorer/target.h"
-#include "utils/fileutils.h"
-#include <QString>
 
 namespace MesonProjectManager {
 namespace Internal {

src/plugins/mesonprojectmanager/mesonbuildsettingswidget.cpp

@@ -3,8 +3,8 @@
 
 #include "mesonbuildsettingswidget.h"
 
-#include "../mesonbuildconfiguration.h"
-#include "../mesonbuildsystem.h"
+#include "mesonbuildconfiguration.h"
+#include "mesonbuildsystem.h"
 
 #include <coreplugin/find/itemviewfind.h>
 

src/plugins/mesonprojectmanager/mesonbuildsettingswidget.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "optionsmodel/buildoptionsmodel.h"
+#include "buildoptionsmodel.h"
 
 #include <projectexplorer/namedwidget.h>
 

src/plugins/mesonprojectmanager/mesonbuildsystem.cpp

@@ -3,11 +3,11 @@
 
 #include "mesonbuildsystem.h"
 
+#include "kithelper.h"
+#include "machinefilemanager.h"
 #include "mesonbuildconfiguration.h"
-#include "kithelper/kithelper.h"
-#include "machinefiles/machinefilemanager.h"
-#include "settings/general/settings.h"
-#include "settings/tools/kitaspect/mesontoolkitaspect.h"
+#include "mesontoolkitaspect.h"
+#include "settings.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/taskhub.h>

src/plugins/mesonprojectmanager/mesonbuildsystem.h

@@ -4,8 +4,7 @@
 #pragma once
 
 #include "mesonprojectparser.h"
-#include "exewrappers/mesonwrapper.h"
-#include "kithelper/kitdata.h"
+#include "kitdata.h"
 
 #include <cppeditor/cppprojectupdater.h>
 

src/plugins/mesonprojectmanager/mesoninfoparser.h

@@ -4,12 +4,12 @@
 #pragma once
 
 #include "buildoptions.h"
+#include "buildoptionsparser.h"
+#include "buildsystemfilesparser.h"
+#include "infoparser.h"
 #include "mesoninfo.h"
-#include "parsers/buildoptionsparser.h"
-#include "parsers/buildsystemfilesparser.h"
-#include "parsers/infoparser.h"
-#include "parsers/targetparser.h"
 #include "target.h"
+#include "targetparser.h"
 
 #include <utils/fileutils.h>
 

src/plugins/mesonprojectmanager/mesonprocess.cpp

@@ -3,7 +3,7 @@
 
 #include "mesonprocess.h"
 
-#include "outputparsers/mesonoutputparser.h"
+#include "mesonoutputparser.h"
 
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>

src/plugins/mesonprojectmanager/mesonprocess.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
+#include "mesonwrapper.h"
 
 #include <QByteArray>
 #include <QElapsedTimer>

src/plugins/mesonprojectmanager/mesonproject.cpp

@@ -4,8 +4,8 @@
 #include "mesonproject.h"
 
 #include "mesonpluginconstants.h"
-#include "settings/tools/kitaspect/mesontoolkitaspect.h"
-#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
+#include "mesontoolkitaspect.h"
+#include "ninjatoolkitaspect.h"
 
 #include <coreplugin/icontext.h>
 

src/plugins/mesonprojectmanager/mesonprojectmanager.qbs

@@ -20,84 +20,84 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "exewrappers/mesontools.cpp",
-            "exewrappers/mesontools.h",
-            "exewrappers/mesonwrapper.cpp",
-            "exewrappers/mesonwrapper.h",
-            "exewrappers/ninjawrapper.h",
-            "exewrappers/toolwrapper.cpp",
-            "exewrappers/toolwrapper.h",
-            "kithelper/kitdata.h",
-            "kithelper/kithelper.h",
-            "machinefiles/machinefilemanager.cpp",
-            "machinefiles/machinefilemanager.h",
-            "machinefiles/nativefilegenerator.cpp",
-            "machinefiles/nativefilegenerator.h",
-            "mesonactionsmanager/mesonactionsmanager.cpp",
-            "mesonactionsmanager/mesonactionsmanager.h",
-            "mesoninfoparser/buildoptions.h",
-            "mesoninfoparser/mesoninfo.h",
-            "mesoninfoparser/mesoninfoparser.h",
-            "mesoninfoparser/parsers/buildoptionsparser.h",
-            "mesoninfoparser/parsers/buildsystemfilesparser.h",
-            "mesoninfoparser/parsers/common.h",
-            "mesoninfoparser/parsers/infoparser.h",
-            "mesoninfoparser/parsers/targetparser.h",
-            "mesoninfoparser/target.h",
+            "mesontools.cpp",
+            "mesontools.h",
+            "mesonwrapper.cpp",
+            "mesonwrapper.h",
+            "ninjawrapper.h",
+            "toolwrapper.cpp",
+            "toolwrapper.h",
+            "kitdata.h",
+            "kithelper.h",
+            "machinefilemanager.cpp",
+            "machinefilemanager.h",
+            "nativefilegenerator.cpp",
+            "nativefilegenerator.h",
+            "mesonactionsmanager.cpp",
+            "mesonactionsmanager.h",
+            "buildoptions.h",
+            "mesoninfo.h",
+            "mesoninfoparser.h",
+            "buildoptionsparser.h",
+            "buildsystemfilesparser.h",
+            "common.h",
+            "infoparser.h",
+            "targetparser.h",
+            "target.h",
             "mesonpluginconstants.h",
             "mesonprojectplugin.cpp",
             "mesonprojectplugin.h",
-            "project/buildoptions/mesonbuildsettingswidget.cpp",
-            "project/buildoptions/mesonbuildsettingswidget.h",
-            "project/buildoptions/optionsmodel/arrayoptionlineedit.cpp",
-            "project/buildoptions/optionsmodel/arrayoptionlineedit.h",
-            "project/buildoptions/optionsmodel/buildoptionsmodel.cpp",
-            "project/buildoptions/optionsmodel/buildoptionsmodel.h",
-            "project/mesonbuildconfiguration.cpp",
-            "project/mesonbuildconfiguration.h",
-            "project/mesonbuildsystem.cpp",
-            "project/mesonbuildsystem.h",
-            "project/mesonprocess.cpp",
-            "project/mesonprocess.h",
-            "project/mesonproject.cpp",
-            "project/mesonproject.h",
-            "project/mesonprojectimporter.cpp",
-            "project/mesonprojectimporter.h",
-            "project/mesonprojectparser.cpp",
-            "project/mesonprojectparser.h",
-            "project/mesonrunconfiguration.cpp",
-            "project/mesonrunconfiguration.h",
-            "project/ninjabuildstep.cpp",
-            "project/ninjabuildstep.h",
-            "project/outputparsers/mesonoutputparser.cpp",
-            "project/outputparsers/mesonoutputparser.h",
-            "project/outputparsers/ninjaparser.cpp",
-            "project/outputparsers/ninjaparser.h",
-            "project/projecttree/mesonprojectnodes.cpp",
-            "project/projecttree/mesonprojectnodes.h",
-            "project/projecttree/projecttree.cpp",
-            "project/projecttree/projecttree.h",
+            "mesonbuildsettingswidget.cpp",
+            "mesonbuildsettingswidget.h",
+            "arrayoptionlineedit.cpp",
+            "arrayoptionlineedit.h",
+            "buildoptionsmodel.cpp",
+            "buildoptionsmodel.h",
+            "mesonbuildconfiguration.cpp",
+            "mesonbuildconfiguration.h",
+            "mesonbuildsystem.cpp",
+            "mesonbuildsystem.h",
+            "mesonprocess.cpp",
+            "mesonprocess.h",
+            "mesonproject.cpp",
+            "mesonproject.h",
+            "mesonprojectimporter.cpp",
+            "mesonprojectimporter.h",
+            "mesonprojectparser.cpp",
+            "mesonprojectparser.h",
+            "mesonrunconfiguration.cpp",
+            "mesonrunconfiguration.h",
+            "ninjabuildstep.cpp",
+            "ninjabuildstep.h",
+            "mesonoutputparser.cpp",
+            "mesonoutputparser.h",
+            "ninjaparser.cpp",
+            "ninjaparser.h",
+            "mesonprojectnodes.cpp",
+            "mesonprojectnodes.h",
+            "projecttree.cpp",
+            "projecttree.h",
             "resources_meson.qrc",
-            "settings/general/settings.cpp",
-            "settings/general/settings.h",
-            "settings/tools/kitaspect/mesontoolkitaspect.cpp",
-            "settings/tools/kitaspect/mesontoolkitaspect.h",
-            "settings/tools/kitaspect/ninjatoolkitaspect.cpp",
-            "settings/tools/kitaspect/ninjatoolkitaspect.h",
-            "settings/tools/kitaspect/toolkitaspectwidget.cpp",
-            "settings/tools/kitaspect/toolkitaspectwidget.h",
-            "settings/tools/toolitemsettings.cpp",
-            "settings/tools/toolitemsettings.h",
-            "settings/tools/toolsmodel.cpp",
-            "settings/tools/toolsmodel.h",
-            "settings/tools/toolssettingsaccessor.cpp",
-            "settings/tools/toolssettingsaccessor.h",
-            "settings/tools/toolssettingspage.cpp",
-            "settings/tools/toolssettingspage.h",
-            "settings/tools/toolssettingswidget.cpp",
-            "settings/tools/toolssettingswidget.h",
-            "settings/tools/tooltreeitem.cpp",
-            "settings/tools/tooltreeitem.h",
+            "settings.cpp",
+            "settings.h",
+            "mesontoolkitaspect.cpp",
+            "mesontoolkitaspect.h",
+            "ninjatoolkitaspect.cpp",
+            "ninjatoolkitaspect.h",
+            "toolkitaspectwidget.cpp",
+            "toolkitaspectwidget.h",
+            "toolitemsettings.cpp",
+            "toolitemsettings.h",
+            "toolsmodel.cpp",
+            "toolsmodel.h",
+            "toolssettingsaccessor.cpp",
+            "toolssettingsaccessor.h",
+            "toolssettingspage.cpp",
+            "toolssettingspage.h",
+            "toolssettingswidget.cpp",
+            "toolssettingswidget.h",
+            "tooltreeitem.cpp",
+            "tooltreeitem.h",
             "versionhelper.h",
         ]
     }
@@ -113,12 +113,12 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "exewrappers/mesonwrapper.cpp",
-            "exewrappers/mesonwrapper.h",
-            "exewrappers/ninjawrapper.h",
-            "exewrappers/toolwrapper.h",
-            "exewrappers/toolwrapper.cpp",
-            "exewrappers/mesontools.h",
+            "mesonwrapper.cpp",
+            "mesonwrapper.h",
+            "ninjawrapper.h",
+            "toolwrapper.h",
+            "toolwrapper.cpp",
+            "mesontools.h",
             "tests/testmesonwrapper.cpp",
         ]
     }
@@ -134,13 +134,13 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "exewrappers/mesonwrapper.cpp",
-            "exewrappers/mesonwrapper.h",
-            "exewrappers/ninjawrapper.h",
-            "exewrappers/toolwrapper.h",
-            "exewrappers/toolwrapper.cpp",
-            "exewrappers/mesontools.h",
-            "mesoninfoparser/mesoninfoparser.h",
+            "mesonwrapper.cpp",
+            "mesonwrapper.h",
+            "ninjawrapper.h",
+            "toolwrapper.h",
+            "toolwrapper.cpp",
+            "mesontools.h",
+            "mesoninfoparser.h",
             "tests/testmesoninfoparser.cpp",
         ]
     }
@@ -156,9 +156,9 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "project/outputparsers/ninjaparser.cpp",
-            "project/outputparsers/ninjaparser.h",
-            "mesoninfoparser/mesoninfoparser.h",
+            "ninjaparser.cpp",
+            "ninjaparser.h",
+            "mesoninfoparser.h",
             "tests/testninjaparser.cpp",
         ]
     }
@@ -175,8 +175,8 @@ Project {
         cpp.includePaths: "."
 
         files: [
-            "project/outputparsers/mesonoutputparser.h",
-            "project/outputparsers/mesonoutputparser.cpp",
+            "mesonoutputparser.h",
+            "mesonoutputparser.cpp",
             "tests/testmesonparser.cpp",
         ]
     }

src/plugins/mesonprojectmanager/mesonprojectnodes.cpp

@@ -3,8 +3,8 @@
 
 #include "mesonprojectnodes.h"
 
-#include "project/mesonbuildconfiguration.h"
-#include "project/mesonbuildsystem.h"
+#include "mesonbuildconfiguration.h"
+#include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
 
 #include <projectexplorer/project.h>

src/plugins/mesonprojectmanager/mesonprojectparser.cpp

@@ -3,10 +3,10 @@
 
 #include "mesonprojectparser.h"
 
-#include "projecttree/mesonprojectnodes.h"
-#include "projecttree/projecttree.h"
-#include "exewrappers/mesontools.h"
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesoninfoparser.h"
+#include "mesonprojectnodes.h"
+#include "mesontools.h"
+#include "projecttree.h"
 
 #include <coreplugin/messagemanager.h>
 

src/plugins/mesonprojectmanager/mesonprojectparser.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
-#include "kithelper/kitdata.h"
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "kitdata.h"
+#include "mesoninfoparser.h"
+#include "mesonoutputparser.h"
 #include "mesonprocess.h"
-#include "outputparsers/mesonoutputparser.h"
-#include "projecttree/mesonprojectnodes.h"
+#include "mesonprojectnodes.h"
+#include "mesonwrapper.h"
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/kit.h>

src/plugins/mesonprojectmanager/mesonprojectplugin.cpp

@@ -3,17 +3,17 @@
 
 #include "mesonprojectplugin.h"
 
-#include "machinefiles/machinefilemanager.h"
-#include "mesonactionsmanager/mesonactionsmanager.h"
-#include "project/mesonbuildconfiguration.h"
-#include "project/mesonproject.h"
-#include "project/mesonrunconfiguration.h"
-#include "project/ninjabuildstep.h"
-#include "settings/general/settings.h"
-#include "settings/tools/kitaspect/mesontoolkitaspect.h"
-#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
-#include "settings/tools/toolssettingsaccessor.h"
-#include "settings/tools/toolssettingspage.h"
+#include "machinefilemanager.h"
+#include "mesonactionsmanager.h"
+#include "mesonbuildconfiguration.h"
+#include "mesonproject.h"
+#include "mesonrunconfiguration.h"
+#include "mesontoolkitaspect.h"
+#include "ninjabuildstep.h"
+#include "ninjatoolkitaspect.h"
+#include "settings.h"
+#include "toolssettingsaccessor.h"
+#include "toolssettingspage.h"
 
 #include <coreplugin/icore.h>
 

src/plugins/mesonprojectmanager/mesontoolkitaspect.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>

src/plugins/mesonprojectmanager/mesonwrapper.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../mesonpluginconstants.h"
+#include "mesonpluginconstants.h"
 #include "toolwrapper.h"
 
 #include <utils/environment.h>

src/plugins/mesonprojectmanager/nativefilegenerator.cpp

@@ -3,7 +3,7 @@
 
 #include "nativefilegenerator.h"
 
-#include "kithelper/kithelper.h"
+#include "kithelper.h"
 
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>

src/plugins/mesonprojectmanager/nativefilegenerator.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "kithelper/kitdata.h"
+#include "kitdata.h"
 
 #include <projectexplorer/kit.h>
 

src/plugins/mesonprojectmanager/ninjabuildstep.cpp

@@ -6,9 +6,9 @@
 #include "mesonbuildconfiguration.h"
 #include "mesonbuildsystem.h"
 #include "mesonpluginconstants.h"
-#include "outputparsers/mesonoutputparser.h"
-#include "settings/general/settings.h"
-#include "settings/tools/kitaspect/ninjatoolkitaspect.h"
+#include "mesonoutputparser.h"
+#include "ninjatoolkitaspect.h"
+#include "settings.h"
 
 #include <coreplugin/find/itemviewfind.h>
 

src/plugins/mesonprojectmanager/ninjabuildstep.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "outputparsers/ninjaparser.h"
+#include "ninjaparser.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildstep.h>

src/plugins/mesonprojectmanager/ninjatoolkitaspect.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitmanager.h>

src/plugins/mesonprojectmanager/ninjawrapper.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../mesonpluginconstants.h"
+#include "mesonpluginconstants.h"
 #include "toolwrapper.h"
 
 namespace MesonProjectManager {

src/plugins/mesonprojectmanager/projecttree.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesoninfoparser.h"
 #include "mesonprojectnodes.h"
 
 #include <utils/fileutils.h>

src/plugins/mesonprojectmanager/targetparser.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "../../mesonpluginconstants.h"
-#include "../target.h"
+#include "mesonpluginconstants.h"
+#include "target.h"
 
 #include <QFile>
 #include <QJsonArray>

src/plugins/mesonprojectmanager/tests/testmesoninfoparser.cpp

@@ -1,8 +1,8 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "exewrappers/mesonwrapper.h"
-#include "mesoninfoparser/mesoninfoparser.h"
+#include "mesonwrapper.h"
+#include "mesoninfoparser.h"
 
 #include <utils/launcherinterface.h>
 #include <utils/singleton.h>

src/plugins/mesonprojectmanager/tests/testmesonparser.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "project/outputparsers/mesonoutputparser.h"
+#include "../mesonoutputparser.h"
 
 #include <projectexplorer/taskhub.h>
 

src/plugins/mesonprojectmanager/tests/testmesonwrapper.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "exewrappers/mesonwrapper.h"
+#include "../mesonwrapper.h"
 
 #include <utils/launcherinterface.h>
 #include <utils/singleton.h>

src/plugins/mesonprojectmanager/tests/testninjaparser.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2020 Alexis Jeandet.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
-#include "project/outputparsers/ninjaparser.h"
+#include "../ninjaparser.h"
 
 #include <QDir>
 #include <QObject>

src/plugins/mesonprojectmanager/toolkitaspectwidget.h

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 #pragma once
 
-#include "exewrappers/mesonwrapper.h"
 #include "mesontoolkitaspect.h"
+#include "mesonwrapper.h"
 #include "ninjatoolkitaspect.h"
 
 #include <projectexplorer/kitmanager.h>

src/plugins/mesonprojectmanager/toolsmodel.cpp

@@ -4,7 +4,7 @@
 #include "toolsmodel.h"
 
 #include "tooltreeitem.h"
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>

src/plugins/mesonprojectmanager/toolsmodel.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <utils/treemodel.h>
 

src/plugins/mesonprojectmanager/toolssettingsaccessor.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 
 #include <utils/settingsaccessor.h>
 

src/plugins/mesonprojectmanager/tooltreeitem.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "exewrappers/mesontools.h"
+#include "mesontools.h"
 #include "toolssettingspage.h"
 
 #include <utils/fileutils.h>