Update includes, fix usage of deprecated functions

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);

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>

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;
     }
+
 }

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>

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);

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>