simple reader and writer: minor fixes

source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp

@@ -4,13 +4,13 @@
 
 namespace armarx::armem::client::util
 {
-    SimpleReaderBase::SimpleReaderBase(ComponentPluginUser& component) :
-        component(component)
+    SimpleReaderBase::SimpleReaderBase(ComponentPluginUser& memoryClient) :
+        component(memoryClient)
     {
     }
 
-    void
-    SimpleReaderBase::registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def)
+    void SimpleReaderBase::registerPropertyDefinitions(
+        armarx::PropertyDefinitionsPtr& def)
     {
         ARMARX_DEBUG << "Writer: registerPropertyDefinitions";
 
@@ -23,8 +23,8 @@ namespace armarx::armem::client::util
     void SimpleReaderBase::connect()
     {
         // Wait for the memory to become available and add it as dependency.
-        ARMARX_IMPORTANT << "Writer: Waiting for memory '"
-                         << props.memoryName << "' ...";
+        ARMARX_IMPORTANT << "Writer: Waiting for memory '" << props.memoryName
+                         << "' ...";
         auto result = component.useMemory(props.memoryName);
         if (not result.success)
         {
@@ -43,10 +43,11 @@ namespace armarx::armem::client::util
         return memoryMutex;
     }
 
-    armem::client::Reader& SimpleReaderBase::memoryReader()
+    const armem::client::Reader& SimpleReaderBase::memoryReader() const
     {
         return memoryReaderClient;
     }
+
     const SimpleReaderBase::Properties& SimpleReaderBase::properties() const
     {
         return props;

source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h

@@ -27,10 +27,6 @@
 
 #include "RobotAPI/libraries/armem/client/Reader.h"
 
-namespace armarx::armem
-{
-    class ClientComponentPluginUser;
-}
 
 namespace armarx::armem::client
 {
@@ -63,7 +59,7 @@ namespace armarx::armem::client::util
         virtual Properties defaultProperties() const = 0;
 
         std::mutex& memoryReaderMutex();
-        armem::client::Reader& memoryReader();
+        const armem::client::Reader& memoryReader() const;
 
     private:
         Properties props;

source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.h

@@ -28,10 +28,6 @@
 // #include "RobotAPI/libraries/armem/client/Reader.h"
 #include "RobotAPI/libraries/armem/client/Writer.h"
 
-namespace armarx::armem
-{
-    class ClientComponentPluginUser;
-}
 
 namespace armarx::armem::client
 {
@@ -43,14 +39,14 @@ namespace armarx::armem::client::util
 
     class SimpleWriterBase
     {
-      public:
+    public:
         SimpleWriterBase(ComponentPluginUser& component);
         virtual ~SimpleWriterBase() = default;
 
         void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
         void connect();
 
-      protected:
+    protected:
         std::mutex& memoryWriterMutex();
         armem::client::Writer& memoryWriter();
 
@@ -66,7 +62,7 @@ namespace armarx::armem::client::util
         virtual std::string propertyPrefix() const   = 0;
         virtual Properties defaultProperties() const = 0;
 
-      private:
+    private:
         Properties props;
 
         armem::client::Writer memoryWriterClient;