From dc58a19981cf2a3980d292f985e1c04a2271b42f Mon Sep 17 00:00:00 2001
From: Christoph Pohl <christoph.pohl@kit.edu>
Date: Mon, 7 Nov 2022 15:30:17 +0100
Subject: [PATCH] Move VariantHelperFactory to main folder
---
.../RobotAPI/libraries/aron_component_config/CMakeLists.txt | 4 ++--
.../aron_component_config/PropertyDefinitionVisitors.cpp | 2 +-
.../libraries/aron_component_config/RemoteGuiVisitors.cpp | 2 +-
.../VariantHelper.cpp => VariantHelperFactory.cpp} | 2 +-
.../VariantHelper.h => VariantHelperFactory.h} | 0
5 files changed, 5 insertions(+), 5 deletions(-)
rename source/RobotAPI/libraries/aron_component_config/{TypeDescriptorFactories/VariantHelper.cpp => VariantHelperFactory.cpp} (99%)
rename source/RobotAPI/libraries/aron_component_config/{TypeDescriptorFactories/VariantHelper.h => VariantHelperFactory.h} (100%)
diff --git a/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt b/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt
index db06c24e6..2529d9e77 100644
--- a/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron_component_config/CMakeLists.txt
@@ -29,7 +29,7 @@ set(LIBS
set(LIB_FILES
PropertyDefinitionVisitors.cpp
RemoteGuiVisitors.cpp
- TypeDescriptorFactories/VariantHelper.cpp
+ VariantHelperFactory.cpp
)
set(LIB_HEADERS
@@ -38,7 +38,7 @@ set(LIB_HEADERS
RemoteGuiVisitors.h
Util.h
ComponentPlugin.h
- TypeDescriptorFactories/VariantHelper.h
+ VariantHelperFactory.h
)
diff --git a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
index 967d498a8..c8a21c747 100644
--- a/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp
@@ -26,7 +26,7 @@
#include <ArmarXCore/core/application/properties/PropertyDefinition.h>
#include <ArmarXCore/core/application/properties/PropertyUser.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
-#include <RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h>
+#include <RobotAPI/libraries/aron_component_config/VariantHelperFactory.h>
#include "Util.h"
diff --git a/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp b/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp
index 9ebaba6f9..42c812449 100644
--- a/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp
@@ -25,7 +25,7 @@
#include <ArmarXGui/libraries/RemoteGui/RemoteGui.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
#include <ArmarXCore/util/CPPUtility/Iterator.h>
-#include <RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h>
+#include <RobotAPI/libraries/aron_component_config/VariantHelperFactory.h>
#include "Util.h"
#define INPUT_GUARD(i) \
diff --git a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.cpp b/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp
similarity index 99%
rename from source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.cpp
rename to source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp
index 76670e105..8a96073c1 100644
--- a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.cpp
+++ b/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.cpp
@@ -23,7 +23,7 @@
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
#include <ArmarXCore/core/application/properties/Property.h>
-#include "VariantHelper.h"
+#include "VariantHelperFactory.h"
namespace armarx::aron::component_config::products
{
diff --git a/source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h b/source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.h
similarity index 100%
rename from source/RobotAPI/libraries/aron_component_config/TypeDescriptorFactories/VariantHelper.h
rename to source/RobotAPI/libraries/aron_component_config/VariantHelperFactory.h
--
GitLab