From 2e593d1de7b737453e1b549f2a8723da957889f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com>
Date: Mon, 15 Jul 2024 13:34:19 +0200
Subject: [PATCH 1/2] Updated deprecated message filter headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
---
 rviz_common/include/rviz_common/message_filter_display.hpp  | 2 +-
 .../rviz_default_plugins/displays/camera/camera_display.hpp | 2 +-
 .../displays/depth_cloud/depth_cloud_display.hpp            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rviz_common/include/rviz_common/message_filter_display.hpp b/rviz_common/include/rviz_common/message_filter_display.hpp
index d73eb89c1..d4b438b99 100644
--- a/rviz_common/include/rviz_common/message_filter_display.hpp
+++ b/rviz_common/include/rviz_common/message_filter_display.hpp
@@ -30,7 +30,7 @@
 #ifndef RVIZ_COMMON__MESSAGE_FILTER_DISPLAY_HPP_
 #define RVIZ_COMMON__MESSAGE_FILTER_DISPLAY_HPP_
 
-#include <message_filters/subscriber.h>
+#include <message_filters/subscriber.hpp>
 #include <tf2_ros/message_filter.h>
 
 #include <memory>
diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/camera/camera_display.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/camera/camera_display.hpp
index 1564d514a..29b5eb4ab 100644
--- a/rviz_default_plugins/include/rviz_default_plugins/displays/camera/camera_display.hpp
+++ b/rviz_default_plugins/include/rviz_default_plugins/displays/camera/camera_display.hpp
@@ -47,7 +47,7 @@
 # include <OgreRenderTargetListener.h>
 # include <OgreSharedPtr.h>
 
-#include <message_filters/cache.h>
+#include <message_filters/cache.hpp>
 
 # include "sensor_msgs/msg/camera_info.hpp"
 # include "tf2_ros/message_filter.h"
diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp
index 6192c37ba..80b778414 100644
--- a/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp
+++ b/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp
@@ -35,9 +35,9 @@
 #include <QObject>  // NOLINT: cpplint cannot handle the include order here
 #include <Ogre.h>
 
-#include <message_filters/subscriber.h>
-#include <message_filters/synchronizer.h>
-#include <message_filters/sync_policies/approximate_time.h>
+#include <message_filters/subscriber.hpp>
+#include <message_filters/synchronizer.hpp>
+#include <message_filters/sync_policies/approximate_time.hpp>
 #include <tf2_ros/message_filter.h>
 
 #include <memory>

From 0462bd396467a1b2962bdd44261f0236c710d37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com>
Date: Wed, 17 Jul 2024 11:39:22 +0200
Subject: [PATCH 2/2] make linters happy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
---
 rviz_common/include/rviz_common/message_filter_display.hpp | 4 ++--
 .../displays/depth_cloud/depth_cloud_display.hpp           | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/rviz_common/include/rviz_common/message_filter_display.hpp b/rviz_common/include/rviz_common/message_filter_display.hpp
index d4b438b99..e1f2f183e 100644
--- a/rviz_common/include/rviz_common/message_filter_display.hpp
+++ b/rviz_common/include/rviz_common/message_filter_display.hpp
@@ -30,11 +30,11 @@
 #ifndef RVIZ_COMMON__MESSAGE_FILTER_DISPLAY_HPP_
 #define RVIZ_COMMON__MESSAGE_FILTER_DISPLAY_HPP_
 
-#include <message_filters/subscriber.hpp>
 #include <tf2_ros/message_filter.h>
-
 #include <memory>
 
+#include <message_filters/subscriber.hpp>
+
 #include "rviz_common/ros_topic_display.hpp"
 #include "rviz_common/properties/int_property.hpp"
 
diff --git a/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp b/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp
index 80b778414..57e8ecd92 100644
--- a/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp
+++ b/rviz_default_plugins/include/rviz_default_plugins/displays/depth_cloud/depth_cloud_display.hpp
@@ -35,9 +35,6 @@
 #include <QObject>  // NOLINT: cpplint cannot handle the include order here
 #include <Ogre.h>
 
-#include <message_filters/subscriber.hpp>
-#include <message_filters/synchronizer.hpp>
-#include <message_filters/sync_policies/approximate_time.hpp>
 #include <tf2_ros/message_filter.h>
 
 #include <memory>
@@ -45,6 +42,10 @@
 #include <set>
 #include <string>
 
+#include <message_filters/subscriber.hpp>
+#include <message_filters/synchronizer.hpp>
+#include <message_filters/sync_policies/approximate_time.hpp>
+
 #include <image_transport/image_transport.hpp>
 #include <image_transport/subscriber_filter.hpp>