From 4125daea75421c69ab54304395b54f6be95dd59e Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 2 Sep 2021 09:07:53 +0200
Subject: [PATCH] Add more user friendly aliases
---
.../armem/client/plugins/ListeningPluginUser.h | 8 ++++++++
.../armem/client/plugins/PluginUser.cpp | 1 -
.../libraries/armem/client/plugins/PluginUser.h | 16 +++++++++++++---
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h b/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h
index 20b124d5d..7314b32c0 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h
+++ b/source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.h
@@ -41,3 +41,11 @@ namespace armarx::armem::client::plugins
};
}
+namespace armarx::armem::client
+{
+ using ListeningPluginUser = plugins::ListeningPluginUser;
+}
+namespace armarx::armem
+{
+ using ListeningClientPluginUser = client::ListeningPluginUser;
+}
diff --git a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp
index 91414da1c..c4129c63d 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp
+++ b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.cpp
@@ -31,4 +31,3 @@ namespace armarx::armem::client::plugins
}
}
-
diff --git a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h
index f67afc8bc..0638084dd 100644
--- a/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h
+++ b/source/RobotAPI/libraries/armem/client/plugins/PluginUser.h
@@ -1,14 +1,16 @@
#pragma once
-// Let's not forward declare this one.
-#include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
+#include <RobotAPI/libraries/armem/client/forward_declarations.h>
#include <ArmarXCore/core/ManagedIceObject.h>
+// Use this one include in your .cpp:
+// #include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
+
+
namespace armarx::armem::client::plugins
{
-
class Plugin;
@@ -46,3 +48,11 @@ namespace armarx::armem::client::plugins
};
}
+namespace armarx::armem::client
+{
+ using PluginUser = plugins::PluginUser;
+}
+namespace armarx::armem
+{
+ using ClientPluginUser = client::PluginUser;
+}
--
GitLab