Concatenate nested namespaces

7 files changed, 14 insertions, 28 deletions

diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index aa4ef663..7448ca6c 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -34,8 +34,7 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 BlockModel::BlockModel(URIs&                               uris,
                        const std::shared_ptr<PluginModel>& plugin,
@@ -292,5 +291,4 @@ BlockModel::set(const std::shared_ptr<ObjectModel>& model)
 	ObjectModel::set(model);
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 02f28324..c492d3e6 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -42,8 +42,7 @@
 #include <utility>
 #include <variant>
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 ClientStore::ClientStore(URIs&                                      uris,
                          Log&                                       log,
@@ -501,5 +500,4 @@ ClientStore::operator()(const DisconnectAll& msg)
 	}
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index a8a40ec7..2a998fdf 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -30,8 +30,7 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 void
 GraphModel::add_child(const std::shared_ptr<ObjectModel>& c)
@@ -181,5 +180,4 @@ GraphModel::polyphonic() const
 	return poly.is_valid() && poly.get<int32_t>();
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 9db429c5..86ffa821 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -29,8 +29,7 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 ObjectModel::ObjectModel(URIs& uris, const raul::Path& path)
 	: Node(uris, path)
@@ -113,5 +112,4 @@ ObjectModel::set_parent(const std::shared_ptr<ObjectModel>& p)
 	_parent = p;
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 4e0391f2..4371132c 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -28,8 +28,7 @@
 
 using std::string;
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 LilvWorld*         PluginModel::_lilv_world   = nullptr;
 const LilvPlugins* PluginModel::_lilv_plugins = nullptr;
@@ -359,5 +358,4 @@ PluginModel::set_lilv_world(LilvWorld* world)
 	_lilv_plugins = lilv_world_get_all_plugins(_lilv_world);
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 031caceb..f0c3834a 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -36,8 +36,7 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 SuilHost* PluginUI::ui_host = nullptr;
 
@@ -344,5 +343,4 @@ PluginUI::is_resizable() const
 	return !fs_matches && !nrs_matches;
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index 0d695a54..73f273c7 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -27,8 +27,7 @@
 #include <memory>
 #include <utility>
 
-namespace ingen {
-namespace client {
+namespace ingen::client {
 
 void
 PortModel::on_property(const URI& uri, const Atom& value)
@@ -84,5 +83,4 @@ PortModel::set(const std::shared_ptr<ObjectModel>& model)
 	}
 }
 
-} // namespace client
-} // namespace ingen
+} // namespace ingen::client