Refs #21266: Delete namespace used in delivery_mechanism example

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
eProsima · Jul 3, 2024 · d0a1327 · d0a1327
1 parent cb54401
commit d0a1327
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 69 deletions.
diff --git a/examples/cpp/delivery_mechanisms/Application.cpp b/examples/cpp/delivery_mechanisms/Application.cpp
@@ -24,8 +24,6 @@
 #include "SubscriberApp.hpp"
 #include "PubSubApp.hpp"
 
-using namespace eprosima::fastdds::dds;
-
 namespace eprosima {
 namespace fastdds {
 namespace examples {

diff --git a/examples/cpp/delivery_mechanisms/CLIParser.hpp b/examples/cpp/delivery_mechanisms/CLIParser.hpp
@@ -28,7 +28,6 @@ namespace fastdds {
 namespace examples {
 namespace delivery_mechanisms {
 
-using namespace eprosima::fastdds::dds;
 using dds::Log;
 
 class CLIParser

diff --git a/examples/cpp/delivery_mechanisms/PubSubApp.cpp b/examples/cpp/delivery_mechanisms/PubSubApp.cpp
@@ -43,8 +43,8 @@
 #include "CLIParser.hpp"
 #include "DeliveryMechanismsPubSubTypes.hpp"
 
-using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
+using namespace eprosima::fastdds::dds;
 
 namespace eprosima {
 namespace fastdds {
@@ -119,7 +119,7 @@ PubSubApp::PubSubApp(
         {
             // Large Data is a builtin transport
             pqos.transport().use_builtin_transports = true;
-            pqos.setup_transports(eprosima::fastdds::rtps::BuiltinTransports::LARGE_DATA);
+            pqos.setup_transports(::BuiltinTransports::LARGE_DATA);
             break;
         }
         case CLIParser::DeliveryMechanismKind::TCPv4:
@@ -135,10 +135,10 @@ PubSubApp::PubSubApp(
                 tcp_ip_address = config.tcp_ip_address;
             }
             // Set unicast locators
-            eprosima::fastdds::rtps::Locator_t tcp_v4_locator_;
+            Locator_t tcp_v4_locator_;
             tcp_v4_locator_.kind = LOCATOR_KIND_TCPv4;
-            eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_v4_locator_, tcp_ip_address);
-            eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_v4_locator_, 5100);
+            IPLocator::setIPv4(tcp_v4_locator_, tcp_ip_address);
+            IPLocator::setPhysicalPort(tcp_v4_locator_, 5100);
             pqos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(tcp_v4_locator_);
             pqos.wire_protocol().default_unicast_locator_list.push_back(tcp_v4_locator_);
             tcp_v4_transport_->set_WAN_address(tcp_ip_address);
@@ -147,7 +147,7 @@ PubSubApp::PubSubApp(
             Locator tcp_v4_initial_peers_locator_;
             tcp_v4_initial_peers_locator_.kind = LOCATOR_KIND_TCPv4;
             tcp_v4_initial_peers_locator_.port = 5100;
-            eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_v4_initial_peers_locator_, tcp_ip_address);
+            IPLocator::setIPv4(tcp_v4_initial_peers_locator_, tcp_ip_address);
             pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_v4_initial_peers_locator_);
             break;
         }
@@ -164,18 +164,18 @@ PubSubApp::PubSubApp(
                 tcp_ip_address = config.tcp_ip_address;
             }
             // Set unicast locators
-            eprosima::fastdds::rtps::Locator_t tcp_v6_locator_;
+            Locator_t tcp_v6_locator_;
             tcp_v6_locator_.kind = LOCATOR_KIND_TCPv6;
-            eprosima::fastdds::rtps::IPLocator::setIPv6(tcp_v6_locator_, tcp_ip_address);
-            eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_v6_locator_, 5100);
+            IPLocator::setIPv6(tcp_v6_locator_, tcp_ip_address);
+            IPLocator::setPhysicalPort(tcp_v6_locator_, 5100);
             pqos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(tcp_v6_locator_);
             pqos.wire_protocol().default_unicast_locator_list.push_back(tcp_v6_locator_);
             tcp_v6_transport_->add_listener_port(5100);
             pqos.transport().user_transports.push_back(tcp_v6_transport_);
             Locator tcp_v6_initial_peers_locator_;
             tcp_v6_initial_peers_locator_.kind = LOCATOR_KIND_TCPv6;
             tcp_v6_initial_peers_locator_.port = 5100;
-            eprosima::fastdds::rtps::IPLocator::setIPv6(tcp_v6_initial_peers_locator_, tcp_ip_address);
+            IPLocator::setIPv6(tcp_v6_initial_peers_locator_, tcp_ip_address);
             pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_v6_initial_peers_locator_);
             break;
         }
@@ -286,7 +286,7 @@ PubSubApp::~PubSubApp()
 }
 
 void PubSubApp::on_publication_matched(
-        eprosima::fastdds::dds::DataWriter* /*writer*/,
+        DataWriter* /*writer*/,
         const PublicationMatchedStatus& info)
 {
     if (info.current_count_change == 1)

diff --git a/examples/cpp/delivery_mechanisms/PubSubApp.hpp b/examples/cpp/delivery_mechanisms/PubSubApp.hpp
@@ -35,16 +35,13 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "DeliveryMechanismsPubSubTypes.hpp"
-
-using namespace eprosima::fastdds::dds;
 
 namespace eprosima {
 namespace fastdds {
 namespace examples {
 namespace delivery_mechanisms {
 
-class PubSubApp : public Application, public DataReaderListener, public DataWriterListener
+class PubSubApp : public Application, public dds::DataReaderListener, public dds::DataWriterListener
 {
 public:
 
@@ -56,17 +53,17 @@ class PubSubApp : public Application, public DataReaderListener, public DataWrit
 
     //! Subscription callback
     void on_data_available(
-            DataReader* reader) override;
+            dds::DataReader* reader) override;
 
     //! Publisher matched method
     void on_publication_matched(
-            DataWriter* writer,
-            const PublicationMatchedStatus& info) override;
+            dds::DataWriter* writer,
+            const dds::PublicationMatchedStatus& info) override;
 
     //! Subscriber matched method
     void on_subscription_matched(
-            DataReader* reader,
-            const SubscriptionMatchedStatus& info) override;
+            dds::DataReader* reader,
+            const dds::SubscriptionMatchedStatus& info) override;
 
     //! Run the subscriber
     void run() override;
@@ -82,19 +79,19 @@ class PubSubApp : public Application, public DataReaderListener, public DataWrit
     //! Publish a sample
     bool publish();
 
-    DomainParticipant* participant_;
+    dds::DomainParticipant* participant_;
 
-    Publisher* publisher_;
+    dds::Publisher* publisher_;
 
-    Subscriber* subscriber_;
+    dds::Subscriber* subscriber_;
 
-    Topic* topic_;
+    dds::Topic* topic_;
 
-    DataReader* reader_;
+    dds::DataReader* reader_;
 
-    DataWriter* writer_;
+    dds::DataWriter* writer_;
 
-    TypeSupport type_;
+    dds::TypeSupport type_;
 
     std::condition_variable cv_;
 

diff --git a/examples/cpp/delivery_mechanisms/PublisherApp.cpp b/examples/cpp/delivery_mechanisms/PublisherApp.cpp
@@ -36,12 +36,10 @@
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
 #include "PublisherApp.hpp"
-#include "DeliveryMechanisms.hpp"
 #include "DeliveryMechanismsPubSubTypes.hpp"
 
-using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
-
+using namespace eprosima::fastdds::dds;
 namespace eprosima {
 namespace fastdds {
 namespace examples {
@@ -104,7 +102,7 @@ PublisherApp::PublisherApp(
         {
             // Large Data is a builtin transport
             pqos.transport().use_builtin_transports = true;
-            pqos.setup_transports(eprosima::fastdds::rtps::BuiltinTransports::LARGE_DATA);
+            pqos.setup_transports(BuiltinTransports::LARGE_DATA);
             break;
         }
         case CLIParser::DeliveryMechanismKind::TCPv4:
@@ -120,10 +118,10 @@ PublisherApp::PublisherApp(
                 tcp_ip_address = config.tcp_ip_address;
             }
             // Set unicast locators
-            eprosima::fastdds::rtps::Locator_t tcp_v4_locator_;
+            Locator_t tcp_v4_locator_;
             tcp_v4_locator_.kind = LOCATOR_KIND_TCPv4;
-            eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_v4_locator_, tcp_ip_address);
-            eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_v4_locator_, 5100);
+            IPLocator::setIPv4(tcp_v4_locator_, tcp_ip_address);
+            IPLocator::setPhysicalPort(tcp_v4_locator_, 5100);
             pqos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(tcp_v4_locator_);
             pqos.wire_protocol().default_unicast_locator_list.push_back(tcp_v4_locator_);
             tcp_v4_transport_->set_WAN_address(tcp_ip_address);
@@ -144,10 +142,10 @@ PublisherApp::PublisherApp(
                 tcp_ip_address = config.tcp_ip_address;
             }
             // Set unicast locators
-            eprosima::fastdds::rtps::Locator_t tcp_v6_locator_;
+            Locator_t tcp_v6_locator_;
             tcp_v6_locator_.kind = LOCATOR_KIND_TCPv6;
-            eprosima::fastdds::rtps::IPLocator::setIPv6(tcp_v6_locator_, tcp_ip_address);
-            eprosima::fastdds::rtps::IPLocator::setPhysicalPort(tcp_v6_locator_, 5100);
+            IPLocator::setIPv6(tcp_v6_locator_, tcp_ip_address);
+            IPLocator::setPhysicalPort(tcp_v6_locator_, 5100);
             pqos.wire_protocol().builtin.metatrafficUnicastLocatorList.push_back(tcp_v6_locator_);
             pqos.wire_protocol().default_unicast_locator_list.push_back(tcp_v6_locator_);
             tcp_v6_transport_->add_listener_port(5100);
@@ -237,7 +235,7 @@ PublisherApp::~PublisherApp()
 }
 
 void PublisherApp::on_publication_matched(
-        eprosima::fastdds::dds::DataWriter* /*writer*/,
+        DataWriter* /*writer*/,
         const PublicationMatchedStatus& info)
 {
     if (info.current_count_change == 1)

diff --git a/examples/cpp/delivery_mechanisms/PublisherApp.hpp b/examples/cpp/delivery_mechanisms/PublisherApp.hpp
@@ -29,16 +29,13 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "DeliveryMechanismsPubSubTypes.hpp"
-
-using namespace eprosima::fastdds::dds;
 
 namespace eprosima {
 namespace fastdds {
 namespace examples {
 namespace delivery_mechanisms {
 
-class PublisherApp : public Application, public DataWriterListener
+class PublisherApp : public Application, public dds::DataWriterListener
 {
 public:
 
@@ -50,8 +47,8 @@ class PublisherApp : public Application, public DataWriterListener
 
     //! Publisher matched method
     void on_publication_matched(
-            DataWriter* writer,
-            const PublicationMatchedStatus& info) override;
+            dds::DataWriter* writer,
+            const dds::PublicationMatchedStatus& info) override;
 
     //! Run publisher
     void run() override;
@@ -67,15 +64,15 @@ class PublisherApp : public Application, public DataWriterListener
     //! Publish a sample
     bool publish();
 
-    DomainParticipant* participant_;
+    dds::DomainParticipant* participant_;
 
-    Publisher* publisher_;
+    dds::Publisher* publisher_;
 
-    Topic* topic_;
+    dds::Topic* topic_;
 
-    DataWriter* writer_;
+    dds::DataWriter* writer_;
 
-    TypeSupport type_;
+    dds::TypeSupport type_;
 
     std::condition_variable cv_;
 

diff --git a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp
@@ -39,9 +39,8 @@
 #include "CLIParser.hpp"
 #include "DeliveryMechanismsPubSubTypes.hpp"
 
-using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
-
+using namespace eprosima::fastdds::dds;
 namespace eprosima {
 namespace fastdds {
 namespace examples {
@@ -104,7 +103,7 @@ SubscriberApp::SubscriberApp(
         {
             // Large Data is a builtin transport
             pqos.transport().use_builtin_transports = true;
-            pqos.setup_transports(eprosima::fastdds::rtps::BuiltinTransports::LARGE_DATA);
+            pqos.setup_transports(BuiltinTransports::LARGE_DATA);
             break;
         }
         case CLIParser::DeliveryMechanismKind::TCPv4:
@@ -117,7 +116,7 @@ SubscriberApp::SubscriberApp(
             {
                 tcp_ip_address = config.tcp_ip_address;
             }
-            eprosima::fastdds::rtps::IPLocator::setIPv4(tcp_v4_initial_peers_locator_, tcp_ip_address);
+            IPLocator::setIPv4(tcp_v4_initial_peers_locator_, tcp_ip_address);
             pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_v4_initial_peers_locator_);
             pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
             pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);
@@ -134,7 +133,7 @@ SubscriberApp::SubscriberApp(
             {
                 tcp_ip_address = config.tcp_ip_address;
             }
-            eprosima::fastdds::rtps::IPLocator::setIPv6(tcp_v6_initial_peers_locator_, tcp_ip_address);
+            IPLocator::setIPv6(tcp_v6_initial_peers_locator_, tcp_ip_address);
             pqos.wire_protocol().builtin.initialPeersList.push_back(tcp_v6_initial_peers_locator_);
             pqos.wire_protocol().builtin.discovery_config.leaseDuration = eprosima::fastdds::c_TimeInfinite;
             pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(5, 0);

diff --git a/examples/cpp/delivery_mechanisms/SubscriberApp.hpp b/examples/cpp/delivery_mechanisms/SubscriberApp.hpp
@@ -32,16 +32,13 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "DeliveryMechanismsPubSubTypes.hpp"
-
-using namespace eprosima::fastdds::dds;
 
 namespace eprosima {
 namespace fastdds {
 namespace examples {
 namespace delivery_mechanisms {
 
-class SubscriberApp : public Application, public DataReaderListener
+class SubscriberApp : public Application, public dds::DataReaderListener
 {
 public:
 
@@ -53,12 +50,12 @@ class SubscriberApp : public Application, public DataReaderListener
 
     //! Subscription callback
     void on_data_available(
-            DataReader* reader) override;
+            dds::DataReader* reader) override;
 
     //! Subscriber matched method
     void on_subscription_matched(
-            DataReader* reader,
-            const SubscriptionMatchedStatus& info) override;
+            dds::DataReader* reader,
+            const dds::SubscriptionMatchedStatus& info) override;
 
     //! Run the subscriber
     void run() override;
@@ -71,15 +68,15 @@ class SubscriberApp : public Application, public DataReaderListener
     //! Return the current state of execution
     bool is_stopped();
 
-    DomainParticipant* participant_;
+    dds::DomainParticipant* participant_;
 
-    Subscriber* subscriber_;
+    dds::Subscriber* subscriber_;
 
-    Topic* topic_;
+    dds::Topic* topic_;
 
-    DataReader* reader_;
+    dds::DataReader* reader_;
 
-    TypeSupport type_;
+    dds::TypeSupport type_;
 
     std::condition_variable cv_;