From 330e243227e8d886e7385eddec0b6163853ff452 Mon Sep 17 00:00:00 2001
From: "Takagi, Isamu" <isamu.takagi@tier4.jp>
Date: Wed, 7 Sep 2022 10:49:54 +0900
Subject: [PATCH] refactor(vehicle_cmd_gate): move private headers

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>
---
 control/vehicle_cmd_gate/src/vehicle_cmd_filter.cpp       | 3 ++-
 .../vehicle_cmd_gate => src}/vehicle_cmd_filter.hpp       | 6 +++---
 control/vehicle_cmd_gate/src/vehicle_cmd_gate.cpp         | 2 +-
 .../vehicle_cmd_gate => src}/vehicle_cmd_gate.hpp         | 8 ++++----
 .../vehicle_cmd_gate/test/src/test_vehicle_cmd_filter.cpp | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename control/vehicle_cmd_gate/{include/vehicle_cmd_gate => src}/vehicle_cmd_filter.hpp (94%)
 rename control/vehicle_cmd_gate/{include/vehicle_cmd_gate => src}/vehicle_cmd_gate.hpp (98%)

diff --git a/control/vehicle_cmd_gate/src/vehicle_cmd_filter.cpp b/control/vehicle_cmd_gate/src/vehicle_cmd_filter.cpp
index 41ed6c9aa62fe..2a000d9902174 100644
--- a/control/vehicle_cmd_gate/src/vehicle_cmd_filter.cpp
+++ b/control/vehicle_cmd_gate/src/vehicle_cmd_filter.cpp
@@ -11,7 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "vehicle_cmd_gate/vehicle_cmd_filter.hpp"
+
+#include "vehicle_cmd_filter.hpp"
 
 #include <algorithm>
 #include <cmath>
diff --git a/control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_filter.hpp b/control/vehicle_cmd_gate/src/vehicle_cmd_filter.hpp
similarity index 94%
rename from control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_filter.hpp
rename to control/vehicle_cmd_gate/src/vehicle_cmd_filter.hpp
index 5562240a35c49..4cb6b6a1cef8f 100644
--- a/control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_filter.hpp
+++ b/control/vehicle_cmd_gate/src/vehicle_cmd_filter.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef VEHICLE_CMD_GATE__VEHICLE_CMD_FILTER_HPP_
-#define VEHICLE_CMD_GATE__VEHICLE_CMD_FILTER_HPP_
+#ifndef VEHICLE_CMD_FILTER_HPP_
+#define VEHICLE_CMD_FILTER_HPP_
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -74,4 +74,4 @@ class VehicleCmdFilter
   double limitDiff(const double curr, const double prev, const double diff_lim) const;
 };
 
-#endif  // VEHICLE_CMD_GATE__VEHICLE_CMD_FILTER_HPP_
+#endif  // VEHICLE_CMD_FILTER_HPP_
diff --git a/control/vehicle_cmd_gate/src/vehicle_cmd_gate.cpp b/control/vehicle_cmd_gate/src/vehicle_cmd_gate.cpp
index 4c36a36d476ec..c3fe705ac51a7 100644
--- a/control/vehicle_cmd_gate/src/vehicle_cmd_gate.cpp
+++ b/control/vehicle_cmd_gate/src/vehicle_cmd_gate.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "vehicle_cmd_gate/vehicle_cmd_gate.hpp"
+#include "vehicle_cmd_gate.hpp"
 
 #include <rclcpp/logging.hpp>
 #include <tier4_api_utils/tier4_api_utils.hpp>
diff --git a/control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_gate.hpp b/control/vehicle_cmd_gate/src/vehicle_cmd_gate.hpp
similarity index 98%
rename from control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_gate.hpp
rename to control/vehicle_cmd_gate/src/vehicle_cmd_gate.hpp
index 3af3a5e8814e0..1c3da0ea6e6d0 100644
--- a/control/vehicle_cmd_gate/include/vehicle_cmd_gate/vehicle_cmd_gate.hpp
+++ b/control/vehicle_cmd_gate/src/vehicle_cmd_gate.hpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef VEHICLE_CMD_GATE__VEHICLE_CMD_GATE_HPP_
-#define VEHICLE_CMD_GATE__VEHICLE_CMD_GATE_HPP_
+#ifndef VEHICLE_CMD_GATE_HPP_
+#define VEHICLE_CMD_GATE_HPP_
 
-#include "vehicle_cmd_gate/vehicle_cmd_filter.hpp"
+#include "vehicle_cmd_filter.hpp"
 
 #include <diagnostic_updater/diagnostic_updater.hpp>
 #include <rclcpp/rclcpp.hpp>
@@ -252,4 +252,4 @@ class VehicleCmdGate : public rclcpp::Node
 };
 
 }  // namespace vehicle_cmd_gate
-#endif  // VEHICLE_CMD_GATE__VEHICLE_CMD_GATE_HPP_
+#endif  // VEHICLE_CMD_GATE_HPP_
diff --git a/control/vehicle_cmd_gate/test/src/test_vehicle_cmd_filter.cpp b/control/vehicle_cmd_gate/test/src/test_vehicle_cmd_filter.cpp
index 382380ce82b95..47c9bde90b8b2 100644
--- a/control/vehicle_cmd_gate/test/src/test_vehicle_cmd_filter.cpp
+++ b/control/vehicle_cmd_gate/test/src/test_vehicle_cmd_filter.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "vehicle_cmd_gate/vehicle_cmd_filter.hpp"
+#include "../../src/vehicle_cmd_filter.hpp"
 
 #include <gtest/gtest.h>