From 2e92deeb03ba42eec1250d1e34c14c758065872a Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:58:15 +0200 Subject: [PATCH] Refs #21129: Migrate fastrtps namespace to fastdds Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- include/eprosimashapesdemo/shapesdemo/ShapeInfo.h | 2 +- src/qt/publishdialog.cpp | 10 +++++----- src/qt/subscribedialog.cpp | 8 ++++---- src/shapesdemo/ShapeHistory.cpp | 10 +++++----- src/shapesdemo/ShapesDemo.cpp | 1 - types/KeylessShapeTypePubSubTypes.cxx | 4 ++-- types/KeylessShapeTypePubSubTypes.h | 8 ++++---- types/ShapePubSubTypes.cxx | 4 ++-- types/ShapePubSubTypes.h | 8 ++++---- 9 files changed, 27 insertions(+), 28 deletions(-) diff --git a/include/eprosimashapesdemo/shapesdemo/ShapeInfo.h b/include/eprosimashapesdemo/shapesdemo/ShapeInfo.h index df32bf5..038ae06 100644 --- a/include/eprosimashapesdemo/shapesdemo/ShapeInfo.h +++ b/include/eprosimashapesdemo/shapesdemo/ShapeInfo.h @@ -36,7 +36,7 @@ #include "eprosimashapesdemo/shapesdemo/ShapeDefinitions.h" #include "types/ShapePubSubTypes.h" -using namespace eprosima::fastrtps; +using namespace eprosima::fastdds; class Shape { diff --git a/src/qt/publishdialog.cpp b/src/qt/publishdialog.cpp index 05d9dd5..ed86858 100644 --- a/src/qt/publishdialog.cpp +++ b/src/qt/publishdialog.cpp @@ -127,7 +127,7 @@ void PublishDialog::on_button_OkCancel_accepted() if (lease_duration_value.toDouble() > 0) { SP->m_dw_qos.liveliness().lease_duration = - eprosima::fastrtps::Duration_t(lease_duration_value.toDouble() * 1e-3); + eprosima::fastdds::Duration_t(lease_duration_value.toDouble() * 1e-3); } } @@ -140,14 +140,14 @@ void PublishDialog::on_button_OkCancel_accepted() SP->m_dw_qos.liveliness().lease_duration != c_TimeInfinite) { SP->m_dw_qos.liveliness().announcement_period = - eprosima::fastrtps::Duration_t(lease_duration_value.toDouble() * 1e-3); + eprosima::fastdds::Duration_t(lease_duration_value.toDouble() * 1e-3); } else { QString value = this->ui->lineEdit_announcementPeriod->text(); if (value.toDouble() > 0) { - SP->m_dw_qos.liveliness().announcement_period = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + SP->m_dw_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } @@ -196,7 +196,7 @@ void PublishDialog::on_button_OkCancel_accepted() QString value = this->ui->lineEdit_Deadline->text(); if (value.toDouble() > 0) { - SP->m_dw_qos.deadline().period = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + SP->m_dw_qos.deadline().period = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } @@ -210,7 +210,7 @@ void PublishDialog::on_button_OkCancel_accepted() QString value = this->ui->lineEdit_Lifespan->text(); if (value.toDouble() > 0) { - SP->m_dw_qos.lifespan().duration = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + SP->m_dw_qos.lifespan().duration = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } diff --git a/src/qt/subscribedialog.cpp b/src/qt/subscribedialog.cpp index 5bc0a76..1dbce80 100644 --- a/src/qt/subscribedialog.cpp +++ b/src/qt/subscribedialog.cpp @@ -139,7 +139,7 @@ void SubscribeDialog::on_buttonBox_accepted() if (value.toDouble() > 0) { // Liveliness is retrieving by user in ms and is stored in s - SSub->m_dr_qos.liveliness().lease_duration = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + SSub->m_dr_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } @@ -164,7 +164,7 @@ void SubscribeDialog::on_buttonBox_accepted() QString value = this->ui->lineEdit_Deadline->text(); if (value.toDouble() > 0) { - SSub->m_dr_qos.deadline().period = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + SSub->m_dr_qos.deadline().period = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } @@ -178,7 +178,7 @@ void SubscribeDialog::on_buttonBox_accepted() QString value = this->ui->lineEdit_Lifespan->text(); if (value.toDouble() > 0) { - SSub->m_dr_qos.lifespan().duration = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + SSub->m_dr_qos.lifespan().duration = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } @@ -220,7 +220,7 @@ void SubscribeDialog::on_buttonBox_accepted() if (value.toInt() > 0) { SSub->m_dr_qos.time_based_filter().minimum_separation = - eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3); + eprosima::fastdds::Duration_t(value.toDouble() * 1e-3); } } diff --git a/src/shapesdemo/ShapeHistory.cpp b/src/shapesdemo/ShapeHistory.cpp index bd19276..efec1f6 100644 --- a/src/shapesdemo/ShapeHistory.cpp +++ b/src/shapesdemo/ShapeHistory.cpp @@ -25,8 +25,8 @@ using namespace eprosima::fastdds::rtps; inline bool compareGUID( - eprosima::fastrtps::rtps::GUID_t& g1, - eprosima::fastrtps::rtps::GUID_t& g2) + GUID_t& g1, + GUID_t& g2) { for (uint8_t i = 0; i < 16; ++i) { @@ -57,8 +57,8 @@ inline bool compareGUID( } inline double Time_tAbsDiff2DoubleMillisec( - const Time_t& t1, - const Time_t& t2) + const eprosima::fastdds::Time_t& t1, + const eprosima::fastdds::Time_t& t2) { double result = 0; result += (double)abs((t2.seconds - t1.seconds) * 1000); @@ -67,7 +67,7 @@ inline double Time_tAbsDiff2DoubleMillisec( } inline double Time_t2MilliSecondsDouble( - const Time_t& t) + const eprosima::fastdds::Time_t& t) { return ((double)t.fraction() / pow(2.0, 32) * pow(10.0, 3)) + (double)t.seconds * pow(10.0, 3); } diff --git a/src/shapesdemo/ShapesDemo.cpp b/src/shapesdemo/ShapesDemo.cpp index d069a0d..52cd938 100644 --- a/src/shapesdemo/ShapesDemo.cpp +++ b/src/shapesdemo/ShapesDemo.cpp @@ -40,7 +40,6 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastdds::rtps; -using namespace eprosima::fastrtps::rtps; ShapesDemo::ShapesDemo( MainWindow* mw) diff --git a/types/KeylessShapeTypePubSubTypes.cxx b/types/KeylessShapeTypePubSubTypes.cxx index 781271a..b8df17d 100644 --- a/types/KeylessShapeTypePubSubTypes.cxx +++ b/types/KeylessShapeTypePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "KeylessShapeTypeCdrAux.hpp" #include "KeylessShapeTypeTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; namespace shapes_demo_typesupport { diff --git a/types/KeylessShapeTypePubSubTypes.h b/types/KeylessShapeTypePubSubTypes.h index c605b9a..20603a7 100644 --- a/types/KeylessShapeTypePubSubTypes.h +++ b/types/KeylessShapeTypePubSubTypes.h @@ -58,18 +58,18 @@ namespace shapes_demo_typesupport eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -84,7 +84,7 @@ namespace shapes_demo_typesupport eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override; diff --git a/types/ShapePubSubTypes.cxx b/types/ShapePubSubTypes.cxx index 4e1a661..d087868 100644 --- a/types/ShapePubSubTypes.cxx +++ b/types/ShapePubSubTypes.cxx @@ -27,8 +27,8 @@ #include "ShapeCdrAux.hpp" #include "ShapeTypeObjectSupport.hpp" -using SerializedPayload_t = eprosima::fastrtps::rtps::SerializedPayload_t; -using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t; +using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t; +using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t; using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t; ShapeTypePubSubType::ShapeTypePubSubType() diff --git a/types/ShapePubSubTypes.h b/types/ShapePubSubTypes.h index ac92938..9508a0a 100644 --- a/types/ShapePubSubTypes.h +++ b/types/ShapePubSubTypes.h @@ -54,18 +54,18 @@ class ShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload) override + eprosima::fastdds::rtps::SerializedPayload_t* payload) override { return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION); } eProsima_user_DllExport bool serialize( void* data, - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; eProsima_user_DllExport bool deserialize( - eprosima::fastrtps::rtps::SerializedPayload_t* payload, + eprosima::fastdds::rtps::SerializedPayload_t* payload, void* data) override; eProsima_user_DllExport std::function getSerializedSizeProvider( @@ -80,7 +80,7 @@ class ShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType eProsima_user_DllExport bool getKey( void* data, - eprosima::fastrtps::rtps::InstanceHandle_t* ihandle, + eprosima::fastdds::rtps::InstanceHandle_t* ihandle, bool force_md5 = false) override; eProsima_user_DllExport void* createData() override;