Adjust for Fast DDS public headers migration to .hpp (#148)

* Refs #21128: Update headers from .h to .hpp Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21128: Update Shape types with Gen's PR Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21128: Update Keyless Shape types with Gen's PR Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #21128: Update PubSubTypes.hpp references Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
eProsima · Jun 27, 2024 · 01e6bf0 · 01e6bf0
1 parent dc0e829
commit 01e6bf0
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 64 deletions.
diff --git a/include/eprosimashapesdemo/shapesdemo/ShapeInfo.h b/include/eprosimashapesdemo/shapesdemo/ShapeInfo.h
@@ -29,12 +29,12 @@
 #include <QString>
 #include <sstream>
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include "eprosimashapesdemo/shapesdemo/ShapeDefinitions.h"
-#include "types/ShapePubSubTypes.h"
+#include "types/ShapePubSubTypes.hpp"
 
 using namespace eprosima::fastdds;
 

diff --git a/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h b/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h
@@ -35,11 +35,11 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/TopicDescription.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 
 #include "eprosimashapesdemo/shapesdemo/ShapeDefinitions.h"
-#include "types/ShapePubSubTypes.h"
+#include "types/ShapePubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 

diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with eProsima Fast DDS Shapes Demo. If not, see <https://www.gnu.org/licenses/>.
 
-#include <fastdds/config.h> // FASTDDS_STATISTICS availability
+#include <fastdds/config.hpp> // FASTDDS_STATISTICS availability
 
 #include "eprosimashapesdemo/qt/optionsdialog.h"
 #include "ui_optionsdialog.h"

diff --git a/src/qt/participantdialog.cpp b/src/qt/participantdialog.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/config.h> // FASTDDS_STATISTICS availability
+#include <fastdds/config.hpp> // FASTDDS_STATISTICS availability
 
 #include "eprosimashapesdemo/qt/participantdialog.h"
 #include "ui_participantdialog.h"

diff --git a/src/qt/publishdialog.cpp b/src/qt/publishdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <eprosimashapesdemo/qt/mainwindow.h>
 

diff --git a/src/qt/subscribedialog.cpp b/src/qt/subscribedialog.cpp
@@ -22,7 +22,7 @@
 
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <QIntValidator>
 #include <QMessageBox>

diff --git a/src/shapesdemo/ShapeHistory.cpp b/src/shapesdemo/ShapeHistory.cpp
@@ -17,8 +17,8 @@
 
 #include <cmath>
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <eprosimashapesdemo/shapesdemo/ShapeHistory.h>
 

diff --git a/src/shapesdemo/ShapeSubscriber.cpp b/src/shapesdemo/ShapeSubscriber.cpp
@@ -22,7 +22,7 @@
 
 #include <fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
 
 #include <eprosimashapesdemo/qt/ContentFilterSelector.h>
 #include <eprosimashapesdemo/qt/mainwindow.h>

diff --git a/src/shapesdemo/ShapesDemo.cpp b/src/shapesdemo/ShapesDemo.cpp
@@ -21,21 +21,21 @@
 #include <iostream>
 #include <sstream>
 
-#include <fastdds/config.h> // FASTDDS_STATISTICS availability
+#include <fastdds/config.hpp> // FASTDDS_STATISTICS availability
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <eprosimashapesdemo/qt/mainwindow.h>
 #include <eprosimashapesdemo/shapesdemo/ShapeInfo.h>
 #include <eprosimashapesdemo/shapesdemo/ShapePublisher.h>
 #include <eprosimashapesdemo/shapesdemo/ShapeSubscriber.h>
 #ifdef ENABLE_ROS_COMPONENTS
-#include <types/KeylessShapeTypePubSubTypes.h>
+#include <types/KeylessShapeTypePubSubTypes.hpp>
 #endif // ifdef ENABLE_ROS_COMPONENTS
 
 using namespace eprosima::fastdds::dds;

diff --git a/types/KeylessShapeType.hpp b/types/KeylessShapeType.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_HPP_
-#define _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_HPP_
+#ifndef FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_HPP
+#define FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_HPP
 
 #include <cstdint>
 #include <string>

diff --git a/types/KeylessShapeTypeCdrAux.hpp b/types/KeylessShapeTypeCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_HPP
+#define FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_HPP
 
 #include "KeylessShapeType.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_HPP
 
diff --git a/types/KeylessShapeTypeCdrAux.ipp b/types/KeylessShapeTypeCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_IPP
+#define FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_IPP
 
 #include "KeylessShapeTypeCdrAux.hpp"
 
@@ -146,5 +146,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPECDRAUX_IPP
 
diff --git a/types/KeylessShapeTypePubSubTypes.cxx b/types/KeylessShapeTypePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "KeylessShapeTypePubSubTypes.h"
+#include "KeylessShapeTypePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>

diff --git a/types/KeylessShapeTypePubSubTypes.h → types/KeylessShapeTypePubSubTypes.hpp b/types/KeylessShapeTypePubSubTypes.h → types/KeylessShapeTypePubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file KeylessShapeTypePubSubTypes.h
+ * @file KeylessShapeTypePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "KeylessShapeType.hpp"
 
@@ -110,7 +110,7 @@ namespace shapes_demo_typesupport
             }
 
             eProsima_user_DllExport inline bool is_plain(
-                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
             {
                 static_cast<void>(data_representation);
                 return false;
@@ -128,12 +128,12 @@ namespace shapes_demo_typesupport
 
         #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-            MD5 m_md5;
+            eprosima::fastdds::MD5 m_md5;
             unsigned char* m_keyBuffer;
 
         };
     } // namespace idl
 } // namespace shapes_demo_typesupport
 
-#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_HPP
 
diff --git a/types/KeylessShapeTypeTypeObjectSupport.hpp b/types/KeylessShapeTypeTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -59,4 +59,4 @@ eProsima_user_DllExport void register_KeylessShapeType_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/types/Shape.hpp b/types/Shape.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPE_HPP_
-#define _FAST_DDS_GENERATED_SHAPE_HPP_
+#ifndef FAST_DDS_GENERATED__SHAPE_HPP
+#define FAST_DDS_GENERATED__SHAPE_HPP
 
 #include <cstdint>
 #include <string>

diff --git a/types/ShapeCdrAux.hpp b/types/ShapeCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_SHAPECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__SHAPECDRAUX_HPP
+#define FAST_DDS_GENERATED__SHAPECDRAUX_HPP
 
 #include "Shape.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SHAPECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__SHAPECDRAUX_HPP
 
diff --git a/types/ShapeCdrAux.ipp b/types/ShapeCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_SHAPECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__SHAPECDRAUX_IPP
+#define FAST_DDS_GENERATED__SHAPECDRAUX_IPP
 
 #include "ShapeCdrAux.hpp"
 
@@ -143,5 +143,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SHAPECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__SHAPECDRAUX_IPP
 
diff --git a/types/ShapePubSubTypes.cxx b/types/ShapePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "ShapePubSubTypes.h"
+#include "ShapePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>

diff --git a/types/ShapePubSubTypes.h → types/ShapePubSubTypes.hpp b/types/ShapePubSubTypes.h → types/ShapePubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file ShapePubSubTypes.h
+ * @file ShapePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_SHAPE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_SHAPE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__SHAPE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__SHAPE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "Shape.hpp"
 
@@ -106,7 +106,7 @@ class ShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class ShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_SHAPE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__SHAPE_PUBSUBTYPES_HPP
 
diff --git a/types/ShapeTypeObjectSupport.hpp b/types/ShapeTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SHAPE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_SHAPE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__SHAPE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__SHAPE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_ShapeType_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_SHAPE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__SHAPE_TYPE_OBJECT_SUPPORT_HPP