From 3957ff76b2f5d09d9d233a550a98c7f8a0a6966e Mon Sep 17 00:00:00 2001
From: "Christian R. G. Dreher" <c.dreher@kit.edu>
Date: Tue, 12 Jan 2021 11:26:48 +0100
Subject: [PATCH] refactor: Move Reader and Writer to client namespace.

---
 .../armem/ArMemExampleClient/ArMemExampleClient.cpp           | 4 ++--
 .../components/armem/ArMemExampleClient/ArMemExampleClient.h  | 2 +-
 .../ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp   | 2 +-
 .../ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h     | 2 +-
 source/RobotAPI/libraries/armem/client/Reader.cpp             | 2 +-
 source/RobotAPI/libraries/armem/client/Reader.h               | 2 +-
 source/RobotAPI/libraries/armem/client/Writer.cpp             | 2 +-
 source/RobotAPI/libraries/armem/client/Writer.h               | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
index 96a2eda81..37a59b28d 100644
--- a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
+++ b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp
@@ -138,7 +138,7 @@ namespace armarx
         sleep(2);
         ARMARX_IMPORTANT << "Running now.";
 
-        armem::Writer writer(memory);
+        armem::client::Writer writer(memory);
 
 
         armem::MemoryID snapshotID;
@@ -301,7 +301,7 @@ namespace armarx
     }
 
 
-    bool ArMemExampleClient::primitives(armem::Writer& writer)
+    bool ArMemExampleClient::primitives(armem::client::Writer& writer)
     {
         ARMARX_IMPORTANT << "Adding segment " << "Primitive" << "/" << getName();
 
diff --git a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
index fdcc34ef4..5fffaebff 100644
--- a/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
+++ b/source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h
@@ -109,7 +109,7 @@ namespace armarx
         void example_entityUpdated(const armem::MemoryID& id);
 
         // Examples
-        bool primitives(armem::Writer& writer);
+        bool primitives(armem::client::Writer& writer);
 
 
     private:
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
index f121e160a..7fd18a174 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
@@ -142,7 +142,7 @@ namespace armarx
         if (memoryName.size() > 0)
         {
             getProxy(memory, memoryName);
-            memoryReader = armem::Reader(memory);
+            memoryReader = armem::client::Reader(memory);
         }
         // DebugObserver is optional (check for null on every call)
         if (!debugObserverName.empty())
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
index aad49aecd..7f5b2ac81 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
@@ -126,7 +126,7 @@ namespace armarx
 
         std::string memoryName;
         armem::MemoryInterfacePrx memory;
-        armem::Reader memoryReader;
+        armem::client::Reader memoryReader;
 
         armem::MemoryPtr memoryData;
 
diff --git a/source/RobotAPI/libraries/armem/client/Reader.cpp b/source/RobotAPI/libraries/armem/client/Reader.cpp
index 5e46975b5..0a0985bd2 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.cpp
+++ b/source/RobotAPI/libraries/armem/client/Reader.cpp
@@ -5,7 +5,7 @@
 #include "../memory/ice_conversions.h"
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     Reader::Reader(ReadingInterfacePrx memory) : memory(memory)
diff --git a/source/RobotAPI/libraries/armem/client/Reader.h b/source/RobotAPI/libraries/armem/client/Reader.h
index 4bfe94d0e..3ab4b5e45 100644
--- a/source/RobotAPI/libraries/armem/client/Reader.h
+++ b/source/RobotAPI/libraries/armem/client/Reader.h
@@ -13,7 +13,7 @@
 #include <RobotAPI/libraries/armem/memory/Memory.h>
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     /**
diff --git a/source/RobotAPI/libraries/armem/client/Writer.cpp b/source/RobotAPI/libraries/armem/client/Writer.cpp
index 3d9fb1b81..cd6b409f8 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.cpp
+++ b/source/RobotAPI/libraries/armem/client/Writer.cpp
@@ -5,7 +5,7 @@
 #include "../error.h"
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     Writer::Writer(WritingInterfacePrx memory) : memory(memory)
diff --git a/source/RobotAPI/libraries/armem/client/Writer.h b/source/RobotAPI/libraries/armem/client/Writer.h
index f2f493d4a..e7c7d67c1 100644
--- a/source/RobotAPI/libraries/armem/client/Writer.h
+++ b/source/RobotAPI/libraries/armem/client/Writer.h
@@ -5,7 +5,7 @@
 #include <RobotAPI/libraries/armem/core/ice_conversions.h>
 
 
-namespace armarx::armem
+namespace armarx::armem::client
 {
 
     /**
-- 
GitLab