From d1a65ab7351f9cb3c7f816e03f99c4efb971ebde Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Wed, 26 Jan 2022 14:58:46 +0100
Subject: [PATCH] includes: <> instead of ""; removing private eigen includes

---
 .../RobotAPI/components/ArViz/Client/elements/Line.cpp |  4 ++--
 .../RobotAPI/components/ArViz/Client/elements/Line.h   |  2 +-
 .../RobotAPI/components/ArViz/Client/elements/Path.h   |  7 +------
 .../ArticulatedObjectLocalizerExample.cpp              |  2 +-
 .../ArticulatedObjectLocalizerExample.h                |  4 ++--
 source/RobotAPI/components/units/ForceTorqueUnit.h     |  3 +--
 source/RobotAPI/components/units/HapticUnit.h          |  3 +--
 source/RobotAPI/components/units/PlatformUnit.cpp      |  2 +-
 .../components/units/PlatformUnitSimulation.cpp        |  2 +-
 .../NJointControllers/NJointTCPController.cpp          |  4 ----
 .../HeartbeatComponentPlugin.cpp                       |  4 ++--
 .../libraries/armem/client/query/selectors.cpp         |  2 +-
 .../articulated_object/ArticulatedObjectReader.cpp     |  6 +++---
 .../armem_objects/client/articulated_object/Reader.cpp | 10 +++++-----
 .../armem_objects/client/articulated_object/utils.h    |  4 ++--
 .../server/instance/ArticulatedObjectVisu.cpp          |  2 +-
 .../libraries/armem_robot/aron_conversions.cpp         |  2 +-
 source/RobotAPI/libraries/armem_robot/types.h          |  4 ++--
 .../client/common/VirtualRobotReader.cpp               |  8 ++++----
 .../armem_robot_state/common/localization/types.h      |  4 ++--
 source/RobotAPI/libraries/armem_robot_state/utils.h    |  5 ++---
 .../RobotAPI/libraries/armem_vision/aron_conversions.h |  4 ++--
 .../libraries/aron/common/aron_conversions/armarx.cpp  |  2 +-
 .../libraries/aron/converter/eigen/EigenConverter.h    |  2 +-
 24 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/source/RobotAPI/components/ArViz/Client/elements/Line.cpp b/source/RobotAPI/components/ArViz/Client/elements/Line.cpp
index 985162f17..35287f4d5 100644
--- a/source/RobotAPI/components/ArViz/Client/elements/Line.cpp
+++ b/source/RobotAPI/components/ArViz/Client/elements/Line.cpp
@@ -1,6 +1,6 @@
 #include "Line.h"
 
-#include "ArmarXCore/interface/core/BasicVectorTypesHelpers.h"
+#include <ArmarXCore/interface/core/BasicVectorTypesHelpers.h>
 
 namespace armarx::viz
 {
@@ -17,4 +17,4 @@ namespace armarx::viz
 
         return *this;
     }
-} // namespace armarx::viz
\ No newline at end of file
+} // namespace armarx::viz
diff --git a/source/RobotAPI/components/ArViz/Client/elements/Line.h b/source/RobotAPI/components/ArViz/Client/elements/Line.h
index 6f6d9427e..2d55b5d34 100644
--- a/source/RobotAPI/components/ArViz/Client/elements/Line.h
+++ b/source/RobotAPI/components/ArViz/Client/elements/Line.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "RobotAPI/components/ArViz/Client/elements/ElementOps.h"
+#include <RobotAPI/components/ArViz/Client/elements/ElementOps.h>
 #include <RobotAPI/interface/ArViz/Elements.h>
 
 namespace armarx::viz
diff --git a/source/RobotAPI/components/ArViz/Client/elements/Path.h b/source/RobotAPI/components/ArViz/Client/elements/Path.h
index 7cfbecbd9..54615e9d4 100644
--- a/source/RobotAPI/components/ArViz/Client/elements/Path.h
+++ b/source/RobotAPI/components/ArViz/Client/elements/Path.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "RobotAPI/components/ArViz/Client/elements/ElementOps.h"
+#include <RobotAPI/components/ArViz/Client/elements/ElementOps.h>
 #include <RobotAPI/interface/ArViz/Elements.h>
 
 namespace armarx::viz
@@ -42,8 +42,3 @@ namespace armarx::viz
         Path& addPoint(Eigen::Vector3f p);
     };
 } // namespace armarx::viz
-
-
-
-
-
diff --git a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
index 70b399165..d5c7d6991 100644
--- a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
+++ b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
@@ -32,7 +32,7 @@
 #include <VirtualRobot/VirtualRobot.h>
 #include <VirtualRobot/XML/RobotIO.h>
 
-#include "ArmarXCore/core/services/tasks/PeriodicTask.h"
+#include <ArmarXCore/core/services/tasks/PeriodicTask.h>
 #include <ArmarXCore/core/PackagePath.h>
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 #include <ArmarXCore/core/logging/Logging.h>
diff --git a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h
index e3747fb3f..d401eed5e 100644
--- a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h
+++ b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h
@@ -3,14 +3,14 @@
 
 #include <VirtualRobot/VirtualRobot.h>
 
-#include "ArmarXCore/core/services/tasks/PeriodicTask.h"
+#include <ArmarXCore/core/services/tasks/PeriodicTask.h>
 #include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/interface/observers/ObserverInterface.h>
 #include <ArmarXCore/util/tasks.h>
 
 #include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
 
-#include "RobotAPI/libraries/armem/core/Time.h"
+#include <RobotAPI/libraries/armem/core/Time.h>
 #include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 #include <RobotAPI/interface/armem/server/MemoryInterface.h>
 #include <RobotAPI/libraries/armem/client/plugins.h>
diff --git a/source/RobotAPI/components/units/ForceTorqueUnit.h b/source/RobotAPI/components/units/ForceTorqueUnit.h
index 30dcf8952..d61360637 100644
--- a/source/RobotAPI/components/units/ForceTorqueUnit.h
+++ b/source/RobotAPI/components/units/ForceTorqueUnit.h
@@ -28,7 +28,7 @@
 #include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/application/properties/Properties.h>
 #include <ArmarXCore/core/system/ImportExportComponent.h>
-#include "RobotAPI/components/units/SensorActorUnit.h"
+#include <RobotAPI/components/units/SensorActorUnit.h>
 
 #include <RobotAPI/interface/units/ForceTorqueUnit.h>
 
@@ -94,4 +94,3 @@ namespace armarx
         std::string listenerName;
     };
 }
-
diff --git a/source/RobotAPI/components/units/HapticUnit.h b/source/RobotAPI/components/units/HapticUnit.h
index df548dc31..26050b480 100644
--- a/source/RobotAPI/components/units/HapticUnit.h
+++ b/source/RobotAPI/components/units/HapticUnit.h
@@ -27,7 +27,7 @@
 #include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/application/properties/Properties.h>
 #include <ArmarXCore/core/system/ImportExportComponent.h>
-#include "RobotAPI/components/units/SensorActorUnit.h"
+#include <RobotAPI/components/units/SensorActorUnit.h>
 
 #include <RobotAPI/interface/units/HapticUnit.h>
 
@@ -83,4 +83,3 @@ namespace armarx
         HapticUnitListenerPrx hapticTopicPrx;
     };
 }
-
diff --git a/source/RobotAPI/components/units/PlatformUnit.cpp b/source/RobotAPI/components/units/PlatformUnit.cpp
index 6f5c6b074..b60e94384 100644
--- a/source/RobotAPI/components/units/PlatformUnit.cpp
+++ b/source/RobotAPI/components/units/PlatformUnit.cpp
@@ -25,7 +25,7 @@
 
 #include "PlatformUnit.h"
 
-#include "ArmarXCore/core/application/properties/PropertyDefinitionContainer.h"
+#include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
 
 #include <SimoxUtility/math/convert/mat4f_to_rpy.h>
 
diff --git a/source/RobotAPI/components/units/PlatformUnitSimulation.cpp b/source/RobotAPI/components/units/PlatformUnitSimulation.cpp
index 0f4d58b0f..15e2f998f 100644
--- a/source/RobotAPI/components/units/PlatformUnitSimulation.cpp
+++ b/source/RobotAPI/components/units/PlatformUnitSimulation.cpp
@@ -24,7 +24,7 @@
 
 
 #include "PlatformUnitSimulation.h"
-#include "RobotAPI/components/units/PlatformUnit.h"
+#include <RobotAPI/components/units/PlatformUnit.h>
 
 #include <RobotAPI/interface/core/GeometryBase.h>
 #include <cmath>
diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp
index 23ae6d229..c67b41d19 100644
--- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp
@@ -229,7 +229,3 @@ namespace armarx
         }
     }
 } // namespace armarx
-
-
-
-
diff --git a/source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp b/source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp
index 743d8a9bc..d0c737105 100644
--- a/source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp
@@ -1,7 +1,7 @@
 #include "HeartbeatComponentPlugin.h"
 
-#include "ArmarXCore/core/Component.h"
-#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
+#include <ArmarXCore/core/Component.h>
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
 
 #include <RobotAPI/interface/components/RobotHealthInterface.h>
 
diff --git a/source/RobotAPI/libraries/armem/client/query/selectors.cpp b/source/RobotAPI/libraries/armem/client/query/selectors.cpp
index ecd3f8c5f..0ea7000b2 100644
--- a/source/RobotAPI/libraries/armem/client/query/selectors.cpp
+++ b/source/RobotAPI/libraries/armem/client/query/selectors.cpp
@@ -1,5 +1,5 @@
 #include "selectors.h"
-#include "RobotAPI/libraries/armem/core/ice_conversions.h"
+#include <RobotAPI/libraries/armem/core/ice_conversions.h>
 
 #include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
 
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp
index c4e703531..f26a62736 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp
@@ -9,9 +9,9 @@
 #include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/system/ArmarXDataPath.h>
 
-#include "RobotAPI/libraries/ArmarXObjects/ObjectInfo.h"
-#include "RobotAPI/libraries/ArmarXObjects/ObjectPose.h"
-#include "RobotAPI/libraries/armem_objects/aron_conversions.h"
+#include <RobotAPI/libraries/ArmarXObjects/ObjectInfo.h>
+#include <RobotAPI/libraries/ArmarXObjects/ObjectPose.h>
+#include <RobotAPI/libraries/armem_objects/aron_conversions.h>
 #include <RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.aron.generated.h>
 #include <RobotAPI/libraries/armem/client/query/Builder.h>
 #include <RobotAPI/libraries/armem/core/Time.h>
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
index 64dfbc7f5..9a4417080 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp
@@ -5,11 +5,11 @@
 
 #include <Eigen/Geometry>
 
-#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
-#include "RobotAPI/libraries/ArmarXObjects/ObjectInfo.h"
-#include "RobotAPI/libraries/ArmarXObjects/ObjectPose.h"
-#include "RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.h"
-#include "RobotAPI/libraries/armem_objects/aron_conversions.h"
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+#include <RobotAPI/libraries/ArmarXObjects/ObjectInfo.h>
+#include <RobotAPI/libraries/ArmarXObjects/ObjectPose.h>
+#include <RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.h>
+#include <RobotAPI/libraries/armem_objects/aron_conversions.h>
 #include <ArmarXCore/core/PackagePath.h>
 #include <ArmarXCore/core/logging/Logging.h>
 #include <RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.aron.generated.h>
diff --git a/source/RobotAPI/libraries/armem_objects/client/articulated_object/utils.h b/source/RobotAPI/libraries/armem_objects/client/articulated_object/utils.h
index 9c5b48f39..5bb773c96 100644
--- a/source/RobotAPI/libraries/armem_objects/client/articulated_object/utils.h
+++ b/source/RobotAPI/libraries/armem_objects/client/articulated_object/utils.h
@@ -3,7 +3,7 @@
 #include <optional>
 
 #include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
-#include "RobotAPI/libraries/armem_robot/types.h"
+#include <RobotAPI/libraries/armem_robot/types.h>
 #include <RobotAPI/libraries/armem_objects/aron/ObjectClass.aron.generated.h>
 
 
@@ -13,4 +13,4 @@ namespace armarx::armem::articulated_object
     std::optional<robot::RobotDescription>
     convertRobotDescription(const armem::wm::EntityInstance& instance);
 
-} // namespace armarx::armem::articulated_object
\ No newline at end of file
+} // namespace armarx::armem::articulated_object
diff --git a/source/RobotAPI/libraries/armem_objects/server/instance/ArticulatedObjectVisu.cpp b/source/RobotAPI/libraries/armem_objects/server/instance/ArticulatedObjectVisu.cpp
index f1b90e5da..a80605575 100644
--- a/source/RobotAPI/libraries/armem_objects/server/instance/ArticulatedObjectVisu.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/instance/ArticulatedObjectVisu.cpp
@@ -4,7 +4,7 @@
 
 #include <SimoxUtility/math/pose.h>
 
-#include "ArmarXCore/core/services/tasks/PeriodicTask.h"
+#include <ArmarXCore/core/services/tasks/PeriodicTask.h>
 #include <ArmarXCore/core/logging/Logging.h>
 #include <ArmarXCore/core/time/CycleUtil.h>
 #include <ArmarXCore/core/time/TimeUtil.h>
diff --git a/source/RobotAPI/libraries/armem_robot/aron_conversions.cpp b/source/RobotAPI/libraries/armem_robot/aron_conversions.cpp
index 1bf28496f..0ab9ff1a4 100644
--- a/source/RobotAPI/libraries/armem_robot/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem_robot/aron_conversions.cpp
@@ -1,6 +1,6 @@
 #include "aron_conversions.h"
 
-#include "ArmarXCore/core/logging/Logging.h"
+#include <ArmarXCore/core/logging/Logging.h>
 #include <RobotAPI/libraries/aron/common/aron_conversions.h>
 
 #include <RobotAPI/libraries/ArmarXObjects/ObjectID.h>
diff --git a/source/RobotAPI/libraries/armem_robot/types.h b/source/RobotAPI/libraries/armem_robot/types.h
index 0a8473073..10ca7475f 100644
--- a/source/RobotAPI/libraries/armem_robot/types.h
+++ b/source/RobotAPI/libraries/armem_robot/types.h
@@ -8,8 +8,8 @@
 
 #include <IceUtil/Time.h>
 
-#include "ArmarXCore/core/exceptions/local/ExpressionException.h"
-#include "RobotAPI/libraries/ArmarXObjects/ObjectID.h"
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+#include <RobotAPI/libraries/ArmarXObjects/ObjectID.h>
 #include <ArmarXCore/core/PackagePath.h>
 
 
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
index 0907cb70b..fb9c2ce38 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
@@ -5,10 +5,10 @@
 #include <VirtualRobot/Robot.h>
 #include <VirtualRobot/XML/RobotIO.h>
 
-#include "ArmarXCore/core/PackagePath.h"
-#include "ArmarXCore/core/logging/Logging.h"
-#include "ArmarXCore/core/system/ArmarXDataPath.h"
-#include "ArmarXCore/core/system/cmake/CMakePackageFinder.h"
+#include <ArmarXCore/core/PackagePath.h>
+#include <ArmarXCore/core/logging/Logging.h>
+#include <ArmarXCore/core/system/ArmarXDataPath.h>
+#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
 
 
 namespace armarx::armem::robot_state
diff --git a/source/RobotAPI/libraries/armem_robot_state/common/localization/types.h b/source/RobotAPI/libraries/armem_robot_state/common/localization/types.h
index e16d599ba..263119617 100644
--- a/source/RobotAPI/libraries/armem_robot_state/common/localization/types.h
+++ b/source/RobotAPI/libraries/armem_robot_state/common/localization/types.h
@@ -26,7 +26,7 @@
 
 #include <ArmarXCore/core/application/properties/PropertyDefinitionContainer.h>
 
-#include <Eigen/src/Geometry/Transform.h>
+
 #include <RobotAPI/libraries/armem_robot_state/types.h>
 
 namespace armarx::armem::common::robot_state::localization
@@ -79,4 +79,4 @@ namespace armarx::armem::common::robot_state::localization
         // bool exact;
     };
 
-}  // namespace armarx::armem::common::robot_state::localization
\ No newline at end of file
+}  // namespace armarx::armem::common::robot_state::localization
diff --git a/source/RobotAPI/libraries/armem_robot_state/utils.h b/source/RobotAPI/libraries/armem_robot_state/utils.h
index 239e0ddb2..9b495f91f 100644
--- a/source/RobotAPI/libraries/armem_robot_state/utils.h
+++ b/source/RobotAPI/libraries/armem_robot_state/utils.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "RobotAPI/libraries/armem/core/MemoryID.h"
-#include "RobotAPI/libraries/armem_robot/types.h"
+#include <RobotAPI/libraries/armem/core/MemoryID.h>
+#include <RobotAPI/libraries/armem_robot/types.h>
 
 namespace armarx::armem::robot_state
 {
     armarx::armem::MemoryID makeMemoryID(const robot::RobotDescription& desc);
 }
-
diff --git a/source/RobotAPI/libraries/armem_vision/aron_conversions.h b/source/RobotAPI/libraries/armem_vision/aron_conversions.h
index 53527f2b5..681049dac 100644
--- a/source/RobotAPI/libraries/armem_vision/aron_conversions.h
+++ b/source/RobotAPI/libraries/armem_vision/aron_conversions.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "RobotAPI/libraries/armem_vision/types.h"
+#include <RobotAPI/libraries/armem_vision/types.h>
 #include <RobotAPI/interface/units/LaserScannerUnit.h>
 #include <RobotAPI/libraries/armem/core/Time.h>
 #include <RobotAPI/libraries/armem_vision/aron/OccupancyGrid.aron.generated.h>
@@ -79,4 +79,4 @@ namespace armarx::armem
         return aron::converter::AronEigenConverter::ConvertFromArray(grid);
     }
 
-} // namespace armarx::armem
\ No newline at end of file
+} // namespace armarx::armem
diff --git a/source/RobotAPI/libraries/aron/common/aron_conversions/armarx.cpp b/source/RobotAPI/libraries/aron/common/aron_conversions/armarx.cpp
index 2cd6b7eb9..d408f45ef 100644
--- a/source/RobotAPI/libraries/aron/common/aron_conversions/armarx.cpp
+++ b/source/RobotAPI/libraries/aron/common/aron_conversions/armarx.cpp
@@ -1,6 +1,6 @@
 #include "armarx.h"
 
-#include <Eigen/src/Core/Matrix.h>
+
 #include <RobotAPI/libraries/aron/common/aron_conversions/core.h>
 #include <RobotAPI/libraries/aron/common/aron_conversions/stl.h>
 
diff --git a/source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h b/source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h
index 56f6690c4..e1213b86b 100644
--- a/source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h
+++ b/source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h
@@ -28,7 +28,7 @@
 // Eigen
 #include <Eigen/Geometry>
 #include <Eigen/Core>
-#include <Eigen/src/Core/util/Constants.h>
+
 
 // ArmarX
 #include <ArmarXCore/core/exceptions/local/ExpressionException.h>
-- 
GitLab