Merge of all branches of Fabian PK (related to skills)

• Merge improved SkillManagerGUI from Tobias Bodmer
• Fix aron code generation for classes without members

@reister. YOu only need to review the changes to aron (Generator.cpp)

Depends on MR armarx-core!246 (merged)

Includes MR !285 (closed) and !320 (closed)

source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h

@@ -27,26 +27,24 @@
 
 #include <ArmarXCore/core/Component.h>
 
+#include <RobotAPI/interface/core/RobotLocalization.h>
 #include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
 #include <RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.h>
 #include <RobotAPI/libraries/armem/server/plugins/ReadWritePluginUser.h>
-
+#include <RobotAPI/libraries/armem_robot_state/server/common/Visu.h>
 #include <RobotAPI/libraries/armem_robot_state/server/description/Segment.h>
 #include <RobotAPI/libraries/armem_robot_state/server/localization/Segment.h>
-#include <RobotAPI/libraries/armem_robot_state/server/common/Visu.h>
-#include <RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.h>
 #include <RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h>
 #include <RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h>
 #include <RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h>
-
-#include <RobotAPI/interface/core/RobotLocalization.h>
+#include <RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.h>
 
 
 namespace armarx::plugins
 {
     class DebugObserverComponentPlugin;
     class RobotUnitComponentPlugin;
-}
+} // namespace armarx::plugins
 namespace armarx::armem::server::robot_state
 {
 
@@ -68,7 +66,6 @@ namespace armarx::armem::server::robot_state
         virtual public armarx::GlobalRobotPoseProvider
     {
     public:
-
         RobotStateMemory();
         virtual ~RobotStateMemory() override;
 
@@ -77,11 +74,12 @@ namespace armarx::armem::server::robot_state
 
 
         // GlobalRobotPoseProvider interface
-        armarx::PoseBasePtr getGlobalRobotPose(Ice::Long timestamp, const std::string& robotName, const ::Ice::Current&) override;
+        armarx::PoseBasePtr getGlobalRobotPose(Ice::Long timestamp,
+                                               const std::string& robotName,
+                                               const ::Ice::Current&) override;
 
 
     protected:
-
         armarx::PropertyDefinitionsPtr createPropertyDefinitions() override;
 
         void onInitComponent() override;
@@ -91,13 +89,11 @@ namespace armarx::armem::server::robot_state
 
 
     private:
-
         void startRobotUnitStream();
         void stopRobotUnitStream();
 
 
     private:
-
         armarx::plugins::DebugObserverComponentPlugin* debugObserver = nullptr;
 
 
@@ -129,7 +125,7 @@ namespace armarx::armem::server::robot_state
             proprioception::RobotStateWriter writer;
 
             // queue
-            using Queue = boost::lockfree::spsc_queue<proprioception::RobotUnitData, boost::lockfree::capacity<1024>>;
+            using Queue = armarx::armem::server::robot_state::proprioception::Queue;
             Queue dataBuffer;
 
             bool waitForRobotUnit = false;
@@ -137,4 +133,4 @@ namespace armarx::armem::server::robot_state
         RobotUnit robotUnit;
     };
 
-}  // namespace armarx::armem::server::robot_state
+} // namespace armarx::armem::server::robot_state