Concatenate nested namespaces

14 files changed, 28 insertions, 74 deletions

diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index 386ed74d..44c734a8 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -42,9 +42,7 @@
 #include <set>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 Connect::Connect(Engine&                           engine,
                  const std::shared_ptr<Interface>& client,
@@ -195,6 +193,4 @@ Connect::undo(Interface& target)
 	target.disconnect(_msg.tail, _msg.head);
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index c62417e0..f6bcc62a 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -42,9 +42,7 @@
 #include <string_view>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 Copy::Copy(Engine&                           engine,
            const std::shared_ptr<Interface>& client,
@@ -230,6 +228,4 @@ Copy::undo(Interface& target)
 	}
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 23a0d35e..73834fcb 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -48,8 +48,7 @@
 #include <memory>
 #include <utility>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class RunContext;
 
@@ -201,5 +200,4 @@ CreateBlock::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index 54a1788e..bcc935bb 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -45,9 +45,7 @@
 #include <memory>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 CreateGraph::CreateGraph(Engine&                           engine,
                          const std::shared_ptr<Interface>& client,
@@ -255,6 +253,4 @@ CreateGraph::undo(Interface& target)
 	target.del(_graph->uri());
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 6eee6ed7..7a01d0d9 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -45,9 +45,7 @@
 #include <memory>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 CreatePort::CreatePort(Engine&                           engine,
                        const std::shared_ptr<Interface>& client,
@@ -224,6 +222,4 @@ CreatePort::undo(Interface& target)
 	target.del(_graph_port->uri());
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp
index ec1af085..b64c81c0 100644
--- a/src/server/events/Delete.cpp
+++ b/src/server/events/Delete.cpp
@@ -50,8 +50,7 @@
 #include <string>
 #include <string_view>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class RunContext;
 
@@ -233,5 +232,4 @@ Delete::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index af3d5b59..0b8cab39 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -57,8 +57,7 @@
 #include <utility>
 #include <vector>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class PreProcessContext;
 
@@ -675,5 +674,4 @@ Delta::get_execution() const
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 3526ac83..ef0cbd0b 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -47,8 +47,7 @@
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class RunContext;
 
@@ -233,5 +232,4 @@ Disconnect::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 7ae17632..957c6a6f 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -39,9 +39,7 @@
 #include <set>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 DisconnectAll::DisconnectAll(Engine&                           engine,
                              const std::shared_ptr<Interface>& client,
@@ -193,6 +191,4 @@ DisconnectAll::adjacent_arcs(GraphImpl* const graph)
 	return arcs;
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 389d9e48..f4cbb49d 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -37,9 +37,7 @@
 #include <memory>
 #include <mutex>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 Get::Get(Engine&                           engine,
          const std::shared_ptr<Interface>& client,
@@ -122,6 +120,4 @@ Get::post_process()
 	}
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp
index 27ca6630..97acdbbb 100644
--- a/src/server/events/Mark.cpp
+++ b/src/server/events/Mark.cpp
@@ -30,9 +30,7 @@
 #include <unordered_set>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 Mark::Mark(Engine&                           engine,
            const std::shared_ptr<Interface>& client,
@@ -136,6 +134,4 @@ Mark::get_execution() const
 	return Execution::NORMAL;
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp
index 8b7ee655..ea05d34c 100644
--- a/src/server/events/Move.cpp
+++ b/src/server/events/Move.cpp
@@ -29,8 +29,7 @@
 #include <memory>
 #include <mutex>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class EnginePort;
 
@@ -92,5 +91,4 @@ Move::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 8b425571..8b599354 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -33,9 +33,7 @@
 #include <cassert>
 #include <memory>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 /** Internal */
 SetPortValue::SetPortValue(Engine&                           engine,
@@ -138,6 +136,4 @@ SetPortValue::post_process()
 	}
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events
diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp
index 9d6fcfaa..ea8c7d69 100644
--- a/src/server/events/Undo.cpp
+++ b/src/server/events/Undo.cpp
@@ -28,9 +28,7 @@
 #include <deque>
 #include <memory>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 Undo::Undo(Engine&                           engine,
            const std::shared_ptr<Interface>& client,
@@ -89,6 +87,4 @@ Undo::post_process()
 	respond();
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events