Refs #21129: Migrate fastrtps namespace to fastdds

elianalf · elianalf · commit 2e92deeb03ba · 2024-06-17T12:45:03.000+02:00
Signed-off-by: elianalf &lt;62831776+elianalf@users.noreply.github.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<uint32_t()> 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
@@ -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
@@ -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<uint32_t()> 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;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`#include "eprosimashapesdemo/shapesdemo/ShapeDefinitions.h"`
`37`	`37`	`#include "types/ShapePubSubTypes.h"`
`38`	`38`
`39`		`-using namespace eprosima::fastrtps;`
	`39`	`+using namespace eprosima::fastdds;`
`40`	`40`
`41`	`41`	`class Shape`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ void PublishDialog::on_button_OkCancel_accepted()`
`127`	`127`	`if (lease_duration_value.toDouble() > 0)`
`128`	`128`	`{`
`129`	`129`	`SP->m_dw_qos.liveliness().lease_duration =`
`130`		`- eprosima::fastrtps::Duration_t(lease_duration_value.toDouble() * 1e-3);`
	`130`	`+ eprosima::fastdds::Duration_t(lease_duration_value.toDouble() * 1e-3);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`@@ -140,14 +140,14 @@ void PublishDialog::on_button_OkCancel_accepted()`
`140`	`140`	`SP->m_dw_qos.liveliness().lease_duration != c_TimeInfinite)`
`141`	`141`	`{`
`142`	`142`	`SP->m_dw_qos.liveliness().announcement_period =`
`143`		`- eprosima::fastrtps::Duration_t(lease_duration_value.toDouble() * 1e-3);`
	`143`	`+ eprosima::fastdds::Duration_t(lease_duration_value.toDouble() * 1e-3);`
`144`	`144`	`}`
`145`	`145`	`else`
`146`	`146`	`{`
`147`	`147`	`QString value = this->ui->lineEdit_announcementPeriod->text();`
`148`	`148`	`if (value.toDouble() > 0)`
`149`	`149`	`{`
`150`		`- SP->m_dw_qos.liveliness().announcement_period = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`150`	`+ SP->m_dw_qos.liveliness().announcement_period = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`@@ -196,7 +196,7 @@ void PublishDialog::on_button_OkCancel_accepted()`
`196`	`196`	`QString value = this->ui->lineEdit_Deadline->text();`
`197`	`197`	`if (value.toDouble() > 0)`
`198`	`198`	`{`
`199`		`- SP->m_dw_qos.deadline().period = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`199`	`+ SP->m_dw_qos.deadline().period = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`@@ -210,7 +210,7 @@ void PublishDialog::on_button_OkCancel_accepted()`
`210`	`210`	`QString value = this->ui->lineEdit_Lifespan->text();`
`211`	`211`	`if (value.toDouble() > 0)`
`212`	`212`	`{`
`213`		`- SP->m_dw_qos.lifespan().duration = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`213`	`+ SP->m_dw_qos.lifespan().duration = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void SubscribeDialog::on_buttonBox_accepted()`
`139`	`139`	`if (value.toDouble() > 0)`
`140`	`140`	`{`
`141`	`141`	`// Liveliness is retrieving by user in ms and is stored in s`
`142`		`- SSub->m_dr_qos.liveliness().lease_duration = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`142`	`+ SSub->m_dr_qos.liveliness().lease_duration = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`@@ -164,7 +164,7 @@ void SubscribeDialog::on_buttonBox_accepted()`
`164`	`164`	`QString value = this->ui->lineEdit_Deadline->text();`
`165`	`165`	`if (value.toDouble() > 0)`
`166`	`166`	`{`
`167`		`- SSub->m_dr_qos.deadline().period = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`167`	`+ SSub->m_dr_qos.deadline().period = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`@@ -178,7 +178,7 @@ void SubscribeDialog::on_buttonBox_accepted()`
`178`	`178`	`QString value = this->ui->lineEdit_Lifespan->text();`
`179`	`179`	`if (value.toDouble() > 0)`
`180`	`180`	`{`
`181`		`- SSub->m_dr_qos.lifespan().duration = eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`181`	`+ SSub->m_dr_qos.lifespan().duration = eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
`@@ -220,7 +220,7 @@ void SubscribeDialog::on_buttonBox_accepted()`
`220`	`220`	`if (value.toInt() > 0)`
`221`	`221`	`{`
`222`	`222`	`SSub->m_dr_qos.time_based_filter().minimum_separation =`
`223`		`- eprosima::fastrtps::Duration_t(value.toDouble() * 1e-3);`
	`223`	`+ eprosima::fastdds::Duration_t(value.toDouble() * 1e-3);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`using namespace eprosima::fastdds::rtps;`
`26`	`26`
`27`	`27`	`inline bool compareGUID(`
`28`		`- eprosima::fastrtps::rtps::GUID_t& g1,`
`29`		`- eprosima::fastrtps::rtps::GUID_t& g2)`
	`28`	`+ GUID_t& g1,`
	`29`	`+ GUID_t& g2)`
`30`	`30`	`{`
`31`	`31`	`for (uint8_t i = 0; i < 16; ++i)`
`32`	`32`	`{`
`@@ -57,8 +57,8 @@ inline bool compareGUID(`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`inline double Time_tAbsDiff2DoubleMillisec(`
`60`		`- const Time_t& t1,`
`61`		`- const Time_t& t2)`
	`60`	`+ const eprosima::fastdds::Time_t& t1,`
	`61`	`+ const eprosima::fastdds::Time_t& t2)`
`62`	`62`	`{`
`63`	`63`	`double result = 0;`
`64`	`64`	`result += (double)abs((t2.seconds - t1.seconds) * 1000);`
`@@ -67,7 +67,7 @@ inline double Time_tAbsDiff2DoubleMillisec(`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`inline double Time_t2MilliSecondsDouble(`
`70`		`- const Time_t& t)`
	`70`	`+ const eprosima::fastdds::Time_t& t)`
`71`	`71`	`{`
`72`	`72`	`return ((double)t.fraction() / pow(2.0, 32) * pow(10.0, 3)) + (double)t.seconds * pow(10.0, 3);`
`73`	`73`	`}`