From 847012000f959d3be9a03c627a065736fe1b19d1 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 25 Jul 2024 09:31:47 +0200
Subject: [PATCH] Meson: Squash remaining namespaces

Change-Id: I44b8ba867f01dfd917a0d1c53c9487865b781d2a
Reviewed-by: hjk <hjk@qt.io>
---
 .../mesonprojectmanager/arrayoptionlineedit.cpp     |  6 ++----
 .../mesonprojectmanager/arrayoptionlineedit.h       |  6 ++----
 src/plugins/mesonprojectmanager/buildoptions.h      | 13 +++++--------
 .../mesonprojectmanager/buildoptionsmodel.cpp       |  6 ++----
 src/plugins/mesonprojectmanager/buildoptionsmodel.h |  6 ++----
 .../mesonprojectmanager/buildoptionsparser.h        |  6 ++----
 src/plugins/mesonprojectmanager/common.h            |  6 ++----
 src/plugins/mesonprojectmanager/kitdata.h           |  6 ++----
 .../mesonprojectmanager/mesonoutputparser.cpp       |  6 ++----
 src/plugins/mesonprojectmanager/mesonoutputparser.h |  6 ++----
 src/plugins/mesonprojectmanager/mesonproject.cpp    |  6 ++----
 src/plugins/mesonprojectmanager/mesonproject.h      |  6 ++----
 .../mesonprojectmanager/mesonprojectimporter.cpp    |  6 ++----
 .../mesonprojectmanager/mesonprojectparser.cpp      |  6 ++----
 .../mesonprojectmanager/mesonprojectparser.h        |  6 ++----
 src/plugins/mesonprojectmanager/ninjaparser.cpp     |  6 ++----
 src/plugins/mesonprojectmanager/ninjaparser.h       |  6 ++----
 src/plugins/mesonprojectmanager/projecttree.cpp     |  6 ++----
 src/plugins/mesonprojectmanager/projecttree.h       |  6 ++----
 src/plugins/mesonprojectmanager/target.h            |  6 ++----
 20 files changed, 43 insertions(+), 84 deletions(-)

diff --git a/src/plugins/mesonprojectmanager/arrayoptionlineedit.cpp b/src/plugins/mesonprojectmanager/arrayoptionlineedit.cpp
index 8212e341679..11aa45e31b5 100644
--- a/src/plugins/mesonprojectmanager/arrayoptionlineedit.cpp
+++ b/src/plugins/mesonprojectmanager/arrayoptionlineedit.cpp
@@ -3,8 +3,7 @@
 
 #include "arrayoptionlineedit.h"
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 ArrayOptionLineEdit::ArrayOptionLineEdit(QWidget *parent)
     : QPlainTextEdit(parent)
@@ -65,5 +64,4 @@ void RegexHighlighter::highlightBlock(const QString &text)
     }
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/arrayoptionlineedit.h b/src/plugins/mesonprojectmanager/arrayoptionlineedit.h
index 1bd424de7c2..c9b8cb6b2c1 100644
--- a/src/plugins/mesonprojectmanager/arrayoptionlineedit.h
+++ b/src/plugins/mesonprojectmanager/arrayoptionlineedit.h
@@ -8,8 +8,7 @@
 #include <QRegularExpression>
 #include <QSyntaxHighlighter>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class RegexHighlighter : public QSyntaxHighlighter
 {
@@ -35,5 +34,4 @@ protected:
     void keyPressEvent(QKeyEvent *e) override;
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/buildoptions.h b/src/plugins/mesonprojectmanager/buildoptions.h
index 0e00beb999e..2f48b6495f9 100644
--- a/src/plugins/mesonprojectmanager/buildoptions.h
+++ b/src/plugins/mesonprojectmanager/buildoptions.h
@@ -14,8 +14,7 @@
 
 #include <optional>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 struct ComboData
 {
@@ -45,13 +44,12 @@ struct FeatureData : ComboData
     {}
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
+
 Q_DECLARE_METATYPE(MesonProjectManager::Internal::FeatureData);
 Q_DECLARE_METATYPE(MesonProjectManager::Internal::ComboData);
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 struct BuildOption
 {
@@ -243,5 +241,4 @@ struct UnknownBuildOption : BuildOption
 
 using BuildOptionsList = std::vector<std::unique_ptr<BuildOption>>;
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp b/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
index f8db40b7498..5dff5f66b28 100644
--- a/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.cpp
@@ -13,8 +13,7 @@
 #include <QStyledItemDelegate>
 #include <QTextEdit>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 // this could be relaxed once we have something able to link reliably meson build type
 // to QTC build type and update it, this must not break any features like tests/debug/profiling...
@@ -192,5 +191,4 @@ void BuildOptionDelegate::setModelData(QWidget *editor,
     }
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/buildoptionsmodel.h b/src/plugins/mesonprojectmanager/buildoptionsmodel.h
index b3969ebe85b..223a9a4a623 100644
--- a/src/plugins/mesonprojectmanager/buildoptionsmodel.h
+++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.h
@@ -13,8 +13,7 @@
 #include <QItemEditorFactory>
 #include <QStyledItemDelegate>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class CancellableOption
 {
@@ -164,5 +163,4 @@ public:
                       const QModelIndex &index) const override;
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/buildoptionsparser.h b/src/plugins/mesonprojectmanager/buildoptionsparser.h
index 4564269f12f..7abd0540eb5 100644
--- a/src/plugins/mesonprojectmanager/buildoptionsparser.h
+++ b/src/plugins/mesonprojectmanager/buildoptionsparser.h
@@ -17,8 +17,7 @@
 
 #include <memory>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class BuildOptionsParser
 {
@@ -95,5 +94,4 @@ public:
     }
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/common.h b/src/plugins/mesonprojectmanager/common.h
index 43ebd013d45..91d21bd3feb 100644
--- a/src/plugins/mesonprojectmanager/common.h
+++ b/src/plugins/mesonprojectmanager/common.h
@@ -11,8 +11,7 @@
 
 #include <optional>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 template<typename T>
 inline T load(QJsonDocument &&doc);
@@ -89,5 +88,4 @@ inline std::optional<T> get(const QJsonObject &obj, const QString &firstPath, co
     return std::nullopt;
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/kitdata.h b/src/plugins/mesonprojectmanager/kitdata.h
index 22a2d767644..e3bd13ed7f3 100644
--- a/src/plugins/mesonprojectmanager/kitdata.h
+++ b/src/plugins/mesonprojectmanager/kitdata.h
@@ -7,8 +7,7 @@
 
 #include <QString>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 struct KitData
 {
@@ -20,5 +19,4 @@ struct KitData
     Utils::QtMajorVersion qtVersion;
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonoutputparser.cpp b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
index 241f05a9160..8342fe030a9 100644
--- a/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
@@ -6,8 +6,7 @@
 #include <projectexplorer/task.h>
 #include <projectexplorer/taskhub.h>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 struct WarningRegex
 {
@@ -136,5 +135,4 @@ void MesonOutputParser::setSourceDirectory(const Utils::FilePath &sourceDir)
     emit newSearchDirFound(sourceDir);
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonoutputparser.h b/src/plugins/mesonprojectmanager/mesonoutputparser.h
index 80bd80103c7..7a56089abc4 100644
--- a/src/plugins/mesonprojectmanager/mesonoutputparser.h
+++ b/src/plugins/mesonprojectmanager/mesonoutputparser.h
@@ -11,8 +11,7 @@
 
 #include <array>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class MesonOutputParser final : public ProjectExplorer::OutputTaskParser
 {
@@ -39,5 +38,4 @@ public:
     void setSourceDirectory(const Utils::FilePath &sourceDir);
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonproject.cpp b/src/plugins/mesonprojectmanager/mesonproject.cpp
index 6baeb03957b..1b9ac8690f6 100644
--- a/src/plugins/mesonprojectmanager/mesonproject.cpp
+++ b/src/plugins/mesonprojectmanager/mesonproject.cpp
@@ -15,8 +15,7 @@
 
 using namespace ProjectExplorer;
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 MesonProject::MesonProject(const Utils::FilePath &path)
     : Project{Constants::Project::MIMETYPE, path}
@@ -57,5 +56,4 @@ DeploymentKnowledge MesonProject::deploymentKnowledge() const
     return DeploymentKnowledge::Bad;
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonproject.h b/src/plugins/mesonprojectmanager/mesonproject.h
index b04f8523e89..d6b6b39366f 100644
--- a/src/plugins/mesonprojectmanager/mesonproject.h
+++ b/src/plugins/mesonprojectmanager/mesonproject.h
@@ -9,8 +9,7 @@
 #include <projectexplorer/projectimporter.h>
 #include <projectexplorer/task.h>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class MesonProject final : public ProjectExplorer::Project
 {
@@ -28,5 +27,4 @@ private:
     mutable std::unique_ptr<MesonProjectImporter> m_projectImporter;
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp b/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp
index cbf75d17de2..7be19c2af96 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectimporter.cpp
@@ -5,8 +5,7 @@
 
 #include <QLoggingCategory>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 static Q_LOGGING_CATEGORY(mInputLog, "qtc.meson.import", QtWarningMsg);
 
@@ -57,5 +56,4 @@ void MesonProjectImporter::deleteDirectoryData(void *directoryData) const
     Q_UNUSED(directoryData)
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
index 5707c4f8b0c..79c4a2ac40a 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp
@@ -29,8 +29,7 @@ using namespace Core;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 static Q_LOGGING_CATEGORY(mesonProcessLog, "qtc.meson.buildsystem", QtWarningMsg);
 
@@ -418,5 +417,4 @@ void MesonProjectParser::processStandardError()
     MessageManager::writeSilently(QString::fromLocal8Bit(m_process->readAllRawStandardError()));
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.h b/src/plugins/mesonprojectmanager/mesonprojectparser.h
index 7c349db1918..5bcd03d6089 100644
--- a/src/plugins/mesonprojectmanager/mesonprojectparser.h
+++ b/src/plugins/mesonprojectmanager/mesonprojectparser.h
@@ -20,8 +20,7 @@
 
 #include <utils/qtcprocess.h>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class MesonProjectParser : public QObject
 {
@@ -118,5 +117,4 @@ private:
     QByteArray m_stderr;
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/ninjaparser.cpp b/src/plugins/mesonprojectmanager/ninjaparser.cpp
index d10ad93c8ad..a07cbd30d41 100644
--- a/src/plugins/mesonprojectmanager/ninjaparser.cpp
+++ b/src/plugins/mesonprojectmanager/ninjaparser.cpp
@@ -5,8 +5,7 @@
 
 #include <utils/fileutils.h>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 NinjaParser::NinjaParser() {}
 
@@ -45,5 +44,4 @@ bool NinjaParser::hasFatalErrors() const
     return false;
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/ninjaparser.h b/src/plugins/mesonprojectmanager/ninjaparser.h
index 6236549ed75..bd121483a8d 100644
--- a/src/plugins/mesonprojectmanager/ninjaparser.h
+++ b/src/plugins/mesonprojectmanager/ninjaparser.h
@@ -9,8 +9,7 @@
 
 #include <optional>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class NinjaParser final : public ProjectExplorer::OutputTaskParser
 {
@@ -28,5 +27,4 @@ public:
     Q_SIGNAL void reportProgress(int progress);
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/projecttree.cpp b/src/plugins/mesonprojectmanager/projecttree.cpp
index 2b98487f24f..0249eba75e8 100644
--- a/src/plugins/mesonprojectmanager/projecttree.cpp
+++ b/src/plugins/mesonprojectmanager/projecttree.cpp
@@ -5,8 +5,7 @@
 
 #include <set>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 ProjectTree::ProjectTree() {}
 
@@ -76,5 +75,4 @@ std::unique_ptr<MesonProjectNode> ProjectTree::buildTree(const Utils::FilePath &
     return root;
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/projecttree.h b/src/plugins/mesonprojectmanager/projecttree.h
index 2335fb65a0d..3d1f4b3c6a7 100644
--- a/src/plugins/mesonprojectmanager/projecttree.h
+++ b/src/plugins/mesonprojectmanager/projecttree.h
@@ -8,8 +8,7 @@
 
 #include <utils/fileutils.h>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 class ProjectTree
 {
@@ -20,5 +19,4 @@ public:
                                                        const Utils::FilePaths &bsFiles);
 };
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal
diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h
index bc137eee90a..5cedaaef325 100644
--- a/src/plugins/mesonprojectmanager/target.h
+++ b/src/plugins/mesonprojectmanager/target.h
@@ -11,8 +11,7 @@
 
 #include <optional>
 
-namespace MesonProjectManager {
-namespace Internal {
+namespace MesonProjectManager::Internal {
 
 inline QStringList cleanPath(QStringList &&paths)
 {
@@ -125,5 +124,4 @@ void for_each_source_group(const TargetsList &targets, const function &f)
     }
 }
 
-} // namespace Internal
-} // namespace MesonProjectManager
+} // namespace MesonProjectManager::Internal