fix(tier4_planning_rviz_plugin): move headers to tier4_planning_rviz_…

…plugin directory (#5927) * fix(tier4_planning_rviz_plugin): move headers to tier4_planning_rviz_plugin directory Signed-off-by: Esteve Fernandez <[email protected]> * style(pre-commit): autofix --------- Signed-off-by: Esteve Fernandez <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
autowarefoundation · Dec 26, 2023 · 51c2254 · 51c2254
1 parent b62b47b
commit 51c2254
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/common/tier4_planning_rviz_plugin/CMakeLists.txt b/common/tier4_planning_rviz_plugin/CMakeLists.txt
@@ -18,13 +18,13 @@ include_directories(
 
 ament_auto_add_library(tier4_planning_rviz_plugin SHARED
   # path point
-  include/path/display_base.hpp
-  include/path/display.hpp
+  include/tier4_planning_rviz_plugin/path/display_base.hpp
+  include/tier4_planning_rviz_plugin/path/display.hpp
   src/path/display.cpp
   # footprint
-  include/pose_with_uuid_stamped/display.hpp
+  include/tier4_planning_rviz_plugin/pose_with_uuid_stamped/display.hpp
   src/pose_with_uuid_stamped/display.cpp
-  include/mission_checkpoint/mission_checkpoint.hpp
+  include/tier4_planning_rviz_plugin/mission_checkpoint/mission_checkpoint.hpp
   src/mission_checkpoint/mission_checkpoint.cpp
   src/tools/jsk_overlay_utils.cpp
   src/tools/max_velocity.cpp

diff --git a/...mission_checkpoint/mission_checkpoint.hpp → ...mission_checkpoint/mission_checkpoint.hpp b/...mission_checkpoint/mission_checkpoint.hpp → ...mission_checkpoint/mission_checkpoint.hpp
@@ -45,8 +45,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MISSION_CHECKPOINT__MISSION_CHECKPOINT_HPP_
-#define MISSION_CHECKPOINT__MISSION_CHECKPOINT_HPP_
+#ifndef TIER4_PLANNING_RVIZ_PLUGIN__MISSION_CHECKPOINT__MISSION_CHECKPOINT_HPP_
+#define TIER4_PLANNING_RVIZ_PLUGIN__MISSION_CHECKPOINT__MISSION_CHECKPOINT_HPP_
 
 #ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
 #include <QObject>
@@ -88,4 +88,4 @@ private Q_SLOTS:
 
 }  // namespace rviz_plugins
 
-#endif  // MISSION_CHECKPOINT__MISSION_CHECKPOINT_HPP_
+#endif  // TIER4_PLANNING_RVIZ_PLUGIN__MISSION_CHECKPOINT__MISSION_CHECKPOINT_HPP_
diff --git a/...ning_rviz_plugin/include/path/display.hpp → ...er4_planning_rviz_plugin/path/display.hpp b/...ning_rviz_plugin/include/path/display.hpp → ...er4_planning_rviz_plugin/path/display.hpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PATH__DISPLAY_HPP_
-#define PATH__DISPLAY_HPP_
+#ifndef TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_HPP_
+#define TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_HPP_
 
-#include <path/display_base.hpp>
+#include "tier4_planning_rviz_plugin/path/display_base.hpp"
 
 #include <autoware_auto_planning_msgs/msg/path.hpp>
 #include <autoware_auto_planning_msgs/msg/path_with_lane_id.hpp>
@@ -228,4 +228,4 @@ class AutowareTrajectoryDisplay
 };
 }  // namespace rviz_plugins
 
-#endif  // PATH__DISPLAY_HPP_
+#endif  // TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_HPP_
diff --git a/...rviz_plugin/include/path/display_base.hpp → ...lanning_rviz_plugin/path/display_base.hpp b/...rviz_plugin/include/path/display_base.hpp → ...lanning_rviz_plugin/path/display_base.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PATH__DISPLAY_BASE_HPP_
-#define PATH__DISPLAY_BASE_HPP_
+#ifndef TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_BASE_HPP_
+#define TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_BASE_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 #include <rviz_common/display_context.hpp>
@@ -40,9 +40,10 @@
 #include <vector>
 
 #define EIGEN_MPL2_ONLY
+#include "tier4_planning_rviz_plugin/utils.hpp"
+
 #include <Eigen/Core>
 #include <Eigen/Geometry>
-#include <utils.hpp>
 
 namespace
 {
@@ -654,4 +655,4 @@ class AutowarePathBaseDisplay : public rviz_common::MessageFilterDisplay<T>
 };
 }  // namespace rviz_plugins
 
-#endif  // PATH__DISPLAY_BASE_HPP_
+#endif  // TIER4_PLANNING_RVIZ_PLUGIN__PATH__DISPLAY_BASE_HPP_
diff --git a/...nclude/pose_with_uuid_stamped/display.hpp → ...plugin/pose_with_uuid_stamped/display.hpp b/...nclude/pose_with_uuid_stamped/display.hpp → ...plugin/pose_with_uuid_stamped/display.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef POSE_WITH_UUID_STAMPED__DISPLAY_HPP_
-#define POSE_WITH_UUID_STAMPED__DISPLAY_HPP_
+#ifndef TIER4_PLANNING_RVIZ_PLUGIN__POSE_WITH_UUID_STAMPED__DISPLAY_HPP_
+#define TIER4_PLANNING_RVIZ_PLUGIN__POSE_WITH_UUID_STAMPED__DISPLAY_HPP_
 
 #include <rviz_common/message_filter_display.hpp>
 
@@ -81,4 +81,4 @@ private Q_SLOTS:
 
 }  // namespace rviz_plugins
 
-#endif  // POSE_WITH_UUID_STAMPED__DISPLAY_HPP_
+#endif  // TIER4_PLANNING_RVIZ_PLUGIN__POSE_WITH_UUID_STAMPED__DISPLAY_HPP_
diff --git a/...r4_planning_rviz_plugin/include/utils.hpp → ...lude/tier4_planning_rviz_plugin/utils.hpp b/...r4_planning_rviz_plugin/include/utils.hpp → ...lude/tier4_planning_rviz_plugin/utils.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS_HPP_
-#define UTILS_HPP_
+#ifndef TIER4_PLANNING_RVIZ_PLUGIN__UTILS_HPP_
+#define TIER4_PLANNING_RVIZ_PLUGIN__UTILS_HPP_
 
 #include <tier4_autoware_utils/geometry/geometry.hpp>
 #include <tier4_autoware_utils/math/normalization.hpp>
@@ -61,4 +61,4 @@ bool isDrivingForward(const T points_with_twist, size_t target_idx)
 }
 }  // namespace rviz_plugins
 
-#endif  // UTILS_HPP_
+#endif  // TIER4_PLANNING_RVIZ_PLUGIN__UTILS_HPP_
diff --git a/common/tier4_planning_rviz_plugin/src/mission_checkpoint/mission_checkpoint.cpp b/common/tier4_planning_rviz_plugin/src/mission_checkpoint/mission_checkpoint.cpp
@@ -45,7 +45,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <mission_checkpoint/mission_checkpoint.hpp>
+#include "tier4_planning_rviz_plugin/mission_checkpoint/mission_checkpoint.hpp"
 
 #ifdef ROS_DISTRO_GALACTIC
 #include <tf2_geometry_msgs/tf2_geometry_msgs.h>

diff --git a/common/tier4_planning_rviz_plugin/src/path/display.cpp b/common/tier4_planning_rviz_plugin/src/path/display.cpp
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <path/display.hpp>
+#include "tier4_planning_rviz_plugin/path/display.hpp"
+
 #include <pluginlib/class_list_macros.hpp>
 
 namespace rviz_plugins

diff --git a/common/tier4_planning_rviz_plugin/src/pose_with_uuid_stamped/display.cpp b/common/tier4_planning_rviz_plugin/src/pose_with_uuid_stamped/display.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "rviz_common/properties/tf_frame_property.hpp"
+#include "tier4_planning_rviz_plugin/pose_with_uuid_stamped/display.hpp"
 
-#include <pose_with_uuid_stamped/display.hpp>
 #include <rviz_common/properties/float_property.hpp>
+#include <rviz_common/properties/tf_frame_property.hpp>
 #include <rviz_common/validate_floats.hpp>
 #include <rviz_rendering/objects/axes.hpp>
 #include <rviz_rendering/objects/movable_text.hpp>