From 11c9946adceffcdbb565400ce8d402fec2ea0591 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Fri, 16 Jul 2021 09:28:01 +0200
Subject: [PATCH] Update includes, fix usage of deprecated functions

---
 source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp   | 3 ++-
 source/RobotAPI/libraries/armem/client/ComponentPlugin.h     | 2 +-
 .../libraries/armem/client/ReaderComponentPlugin.cpp         | 5 ++++-
 .../RobotAPI/libraries/armem/client/ReaderComponentPlugin.h  | 2 +-
 .../libraries/armem/client/WriterComponentPlugin.cpp         | 5 ++++-
 .../RobotAPI/libraries/armem/client/WriterComponentPlugin.h  | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
index a68e742cd..a88f374d6 100644
--- a/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
@@ -31,7 +31,8 @@ armarx::armem::client::ComponentPluginUser::setMemoryServer(server::MemoryInterf
 armarx::armem::data::WaitForMemoryResult
 armarx::armem::client::ComponentPluginUser::useMemoryServer(const std::string& memoryName)
 {
-    armem::data::WaitForMemoryResult result = MemoryNameSystemComponentPluginUser::useMemoryServer(memoryName);
+    armem::data::WaitForMemoryResult result;
+    result.proxy = memoryNameSystem.useServer(MemoryID().withMemoryName(memoryName));
     if (result.proxy)
     {
         setMemoryServer(result.proxy);
diff --git a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
index 3bdbde93b..ae3f26b26 100644
--- a/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ComponentPlugin.h
@@ -2,7 +2,7 @@
 
 
 // ArmarX
-#include <ArmarXCore/core/Component.h>
+#include <ArmarXCore/core/ComponentPlugin.h>
 
 // RobotAPI
 #include <RobotAPI/interface/armem/server/MemoryInterface.h>
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
index 3204c83cc..3ac9f7438 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
@@ -2,6 +2,7 @@
 
 
 // ArmarX
+#include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
 // RobotAPI
@@ -47,11 +48,13 @@ namespace armarx::armem::client
 
     armem::data::WaitForMemoryResult ReaderComponentPluginUser::useMemoryServer(const std::string& memoryName)
     {
-        armem::data::WaitForMemoryResult result = MemoryNameSystemComponentPluginUser::useMemoryServer(memoryName);
+        armem::data::WaitForMemoryResult result;
+        result.proxy = memoryNameSystem.useServer(memoryName);
         if (result.proxy)
         {
             setReadingMemoryServer(result.proxy);
         }
         return result;
     }
+
 }
diff --git a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
index 0a2e37ba9..c0139e609 100644
--- a/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
@@ -5,7 +5,7 @@
 #include <vector>
 
 // ArmarX
-#include <ArmarXCore/core/Component.h>
+#include <ArmarXCore/core/ComponentPlugin.h>
 
 // RobotAPI
 #include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
index 093f29e6f..d4b95ca35 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
@@ -2,6 +2,7 @@
 
 
 // ArmarX
+#include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
 // RobotAPI
@@ -43,9 +44,11 @@ namespace armarx::armem::client
         memoryWriter.setWritingMemory(memory);
     }
 
+
     armem::data::WaitForMemoryResult WriterComponentPluginUser::useMemoryServer(const std::string& memoryName)
     {
-        armem::data::WaitForMemoryResult result = MemoryNameSystemComponentPluginUser::useMemoryServer(memoryName);
+        armem::data::WaitForMemoryResult result;
+        result.proxy = memoryNameSystem.useServer(MemoryID().withMemoryName(memoryName));
         if (result.proxy)
         {
             setWritingMemoryServer(result.proxy);
diff --git a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
index 435881b48..3ae9a66bf 100644
--- a/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
@@ -2,7 +2,7 @@
 
 
 // ArmarX
-#include <ArmarXCore/core/Component.h>
+#include <ArmarXCore/core/ComponentPlugin.h>
 
 // RobotAPI
 #include <RobotAPI/libraries/aron/core/navigator/data/AllNavigators.h>
-- 
GitLab