From 1ac2914c378199bbaeeb1435efb64fff76f98a6d Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Tue, 31 Aug 2021 13:17:20 +0200 Subject: [PATCH] rename some CGVs to CCFs --- include/ccf/connection/Connection.h | 6 +++--- include/ccf/connection/MqttConnection.h | 6 +++--- include/ccf/connection/NngConnection.h | 6 +++--- include/ccf/controller/Controller.h | 6 +++--- include/ccf/controller/DummyRobotArmController.h | 6 +++--- include/ccf/controller/MoveItRobotArmController.h | 6 +++--- include/ccf/controller/RobotArmController.h | 6 +++--- include/ccf/util/scene_collision_object.h | 6 +++--- include/ccf/util/scene_constructor_util.h | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/ccf/connection/Connection.h b/include/ccf/connection/Connection.h index 1330d06..93e80f0 100644 --- a/include/ccf/connection/Connection.h +++ b/include/ccf/connection/Connection.h @@ -2,8 +2,8 @@ // Created by Johannes Mey on 28/04/2021. // -#ifndef CGV_CONNECTOR_WORKSPACE_CONNECTION_H -#define CGV_CONNECTOR_WORKSPACE_CONNECTION_H +#ifndef CCF_CONNECTION_H +#define CCF_CONNECTION_H #include <string> #include <functional> @@ -34,4 +34,4 @@ public: virtual bool send(const std::string &channel, const std::string &message) = 0; }; -#endif //CGV_CONNECTOR_WORKSPACE_CONNECTION_H +#endif //CCF_CONNECTION_H diff --git a/include/ccf/connection/MqttConnection.h b/include/ccf/connection/MqttConnection.h index 63d2131..e86f49c 100644 --- a/include/ccf/connection/MqttConnection.h +++ b/include/ccf/connection/MqttConnection.h @@ -2,8 +2,8 @@ // Created by Sebastian Ebert on 04.05.21. // -#ifndef CGV_SIM_MQTTCONNECTION_H -#define CGV_SIM_MQTTCONNECTION_H +#ifndef CCF_MQTTCONNECTION_H +#define CCF_MQTTCONNECTION_H #include "Connection.h" @@ -40,4 +40,4 @@ private: bool ensureConnection(); }; -#endif //CGV_SIM_MQTTCONNECTION_H \ No newline at end of file +#endif //CCF_MQTTCONNECTION_H \ No newline at end of file diff --git a/include/ccf/connection/NngConnection.h b/include/ccf/connection/NngConnection.h index ae8e4dc..f332750 100644 --- a/include/ccf/connection/NngConnection.h +++ b/include/ccf/connection/NngConnection.h @@ -2,8 +2,8 @@ // Created by jm on 28/04/2021. // -#ifndef CGV_CONNECTOR_WORKSPACE_NNGCONNECTION_H -#define CGV_CONNECTOR_WORKSPACE_NNGCONNECTION_H +#ifndef CCF_NNGCONNECTION_H +#define CCF_NNGCONNECTION_H #include "Connection.h" @@ -53,4 +53,4 @@ public: }; -#endif //CGV_CONNECTOR_WORKSPACE_NNGCONNECTION_H +#endif //CCF_NNGCONNECTION_H diff --git a/include/ccf/controller/Controller.h b/include/ccf/controller/Controller.h index 113cbbe..9c22b96 100644 --- a/include/ccf/controller/Controller.h +++ b/include/ccf/controller/Controller.h @@ -2,8 +2,8 @@ // Created by Johannes Mey on 17/01/2021. // -#ifndef CGV_CONNECTOR_WORKSPACE_CONTROLLER_H -#define CGV_CONNECTOR_WORKSPACE_CONTROLLER_H +#ifndef CCF_CONTROLLER_H +#define CCF_CONTROLLER_H #include <functional> #include <optional> @@ -35,4 +35,4 @@ public: }; -#endif //CGV_CONNECTOR_WORKSPACE_CONTROLLER_H +#endif //CCF_CONTROLLER_H diff --git a/include/ccf/controller/DummyRobotArmController.h b/include/ccf/controller/DummyRobotArmController.h index 7cac024..252c95d 100644 --- a/include/ccf/controller/DummyRobotArmController.h +++ b/include/ccf/controller/DummyRobotArmController.h @@ -2,8 +2,8 @@ // Created by Johannes Mey on 17/01/2021. // -#ifndef CGV_CONNECTOR_WORKSPACE_DUMMYROBOTARMCONTROLLER_H -#define CGV_CONNECTOR_WORKSPACE_DUMMYROBOTARMCONTROLLER_H +#ifndef CCF_DUMMYROBOTARMCONTROLLER_H +#define CCF_DUMMYROBOTARMCONTROLLER_H #include "RobotArmController.h" @@ -33,4 +33,4 @@ public: virtual bool reachableObject(const Object &robot, const Object &object) override; }; -#endif //CGV_CONNECTOR_WORKSPACE_DUMMYROBOTARMCONTROLLER_H +#endif //CCF_DUMMYROBOTARMCONTROLLER_H diff --git a/include/ccf/controller/MoveItRobotArmController.h b/include/ccf/controller/MoveItRobotArmController.h index 0b0066a..9c745c2 100644 --- a/include/ccf/controller/MoveItRobotArmController.h +++ b/include/ccf/controller/MoveItRobotArmController.h @@ -2,8 +2,8 @@ // Created by Johannes Mey on 17/01/2021. // -#ifndef CGV_CONNECTOR_WORKSPACE_MOVEITROBOTARMCONTROLLER_H -#define CGV_CONNECTOR_WORKSPACE_MOVEITROBOTARMCONTROLLER_H +#ifndef CCF_MOVEITROBOTARMCONTROLLER_H +#define CCF_MOVEITROBOTARMCONTROLLER_H #include <ccf/SceneUpdate.h> @@ -35,4 +35,4 @@ public: }; -#endif //CGV_CONNECTOR_WORKSPACE_MOVEITROBOTARMCONTROLLER_H +#endif //CCF_MOVEITROBOTARMCONTROLLER_H diff --git a/include/ccf/controller/RobotArmController.h b/include/ccf/controller/RobotArmController.h index f3d047e..00621ea 100644 --- a/include/ccf/controller/RobotArmController.h +++ b/include/ccf/controller/RobotArmController.h @@ -2,8 +2,8 @@ // Created by Johannes Mey on 17/01/2021. // -#ifndef CGV_CONNECTOR_WORKSPACE_ROBOTARMCONTROLLER_H -#define CGV_CONNECTOR_WORKSPACE_ROBOTARMCONTROLLER_H +#ifndef CCF_ROBOTARMCONTROLLER_H +#define CCF_ROBOTARMCONTROLLER_H #include <functional> #include <optional> @@ -95,4 +95,4 @@ public: Object *resolveObject(const std::string &id); }; -#endif //CGV_CONNECTOR_WORKSPACE_ROBOTARMCONTROLLER_H +#endif //CCF_ROBOTARMCONTROLLER_H diff --git a/include/ccf/util/scene_collision_object.h b/include/ccf/util/scene_collision_object.h index 4857e99..55b851b 100644 --- a/include/ccf/util/scene_collision_object.h +++ b/include/ccf/util/scene_collision_object.h @@ -2,8 +2,8 @@ // Created by sebastian on 14.01.21. // -#ifndef CGV_CONNECTOR_SCENECOLLISIONOBJECT_H -#define CGV_CONNECTOR_SCENECOLLISIONOBJECT_H +#ifndef CCF_SCENECOLLISIONOBJECT_H +#define CCF_SCENECOLLISIONOBJECT_H #include <moveit/planning_scene_interface/planning_scene_interface.h> #include <moveit/move_group_interface/move_group_interface.h> @@ -37,4 +37,4 @@ private: }; -#endif //CGV_CONNECTOR_SCENECOLLISIONOBJECT_H +#endif //CCF_SCENECOLLISIONOBJECT_H diff --git a/include/ccf/util/scene_constructor_util.h b/include/ccf/util/scene_constructor_util.h index a680d15..7b73381 100644 --- a/include/ccf/util/scene_constructor_util.h +++ b/include/ccf/util/scene_constructor_util.h @@ -2,8 +2,8 @@ // Created by Sebastian Ebert on 03.08.20. // -#ifndef CGV_CONNECTOR_SCENE_CONSTRUCTOR_H -#define CGV_CONNECTOR_SCENE_CONSTRUCTOR_H +#ifndef CCF_SCENE_CONSTRUCTOR_H +#define CCF_SCENE_CONSTRUCTOR_H #include <moveit/planning_scene_interface/planning_scene_interface.h> @@ -55,4 +55,4 @@ public: std::vector<std_msgs::ColorRGBA> &collision_objects_colors, const Scene &scene); }; -#endif //CGV_CONNECTOR_SCENE_CONSTRUCTOR_H \ No newline at end of file +#endif //CCF_SCENE_CONSTRUCTOR_H \ No newline at end of file -- GitLab