Refs #21137. Namespace suggestion.

Signed-off-by: Miguel Company <[email protected]>

src/cpp/rtps/flowcontrol/FlowController.hpp

@@ -33,7 +33,7 @@ class FlowController
      * @param writer Pointer to the writer to be registered. Cannot be nullptr.
      */
     virtual void register_writer(
-            fastdds::rtps::BaseWriter* writer) = 0;
+            BaseWriter* writer) = 0;
 
     /*!
      * Unregister a writer.
@@ -42,7 +42,7 @@ class FlowController
      * @param writer Pointer to the writer to be unregistered. Cannot be nullptr.
      */
     virtual void unregister_writer(
-            fastdds::rtps::BaseWriter* writer) = 0;
+            BaseWriter* writer) = 0;
 
     /*!
      * Adds a CacheChange_t to be managed by this object.
@@ -55,8 +55,8 @@ class FlowController
      * @return true if the sample could be added. false otherwise.
      */
     virtual bool add_new_sample(
-            fastdds::rtps::BaseWriter* writer,
-            fastdds::rtps::CacheChange_t* change,
+            BaseWriter* writer,
+            CacheChange_t* change,
             const std::chrono::time_point<std::chrono::steady_clock>& max_blocking_time) = 0;
 
     /*!
@@ -69,8 +69,8 @@ class FlowController
      * @return true if the sample could be added. false otherwise.
      */
     virtual bool add_old_sample(
-            fastdds::rtps::BaseWriter* writer,
-            fastdds::rtps::CacheChange_t* change) = 0;
+            BaseWriter* writer,
+            CacheChange_t* change) = 0;
 
     /*!
      * If the CacheChange_t is currently managed by this object, remove it.
@@ -81,7 +81,7 @@ class FlowController
      * @return true if the sample could be removed. false otherwise.
      */
     virtual bool remove_change(
-            fastdds::rtps::CacheChange_t* change,
+            CacheChange_t* change,
             const std::chrono::time_point<std::chrono::steady_clock>& max_blocking_time) = 0;
 
     /*!

src/cpp/rtps/writer/StatefulWriter.cpp

@@ -64,9 +64,6 @@ namespace eprosima {
 namespace fastdds {
 namespace rtps {
 
-using BaseReader = fastdds::rtps::BaseReader;
-using BaseWriter = fastdds::rtps::BaseWriter;
-
 /**
  * Loops over all the readers in the vector, applying the given routine.
  * The loop continues until the result of the routine is true for any reader

src/cpp/rtps/writer/StatefulWriter.hpp

@@ -44,7 +44,7 @@ class TimedEvent;
  * Class StatefulWriter, specialization of BaseWriter that maintains information of each matched Reader.
  * @ingroup WRITER_MODULE
  */
-class StatefulWriter : public fastdds::rtps::BaseWriter
+class StatefulWriter : public BaseWriter
 {
     friend class RTPSParticipantImpl;
     friend class ReaderProxy;

src/cpp/rtps/writer/StatelessWriter.cpp

@@ -49,9 +49,6 @@ namespace eprosima {
 namespace fastdds {
 namespace rtps {
 
-using BaseReader = fastdds::rtps::BaseReader;
-using BaseWriter = fastdds::rtps::BaseWriter;
-
 /**
  * Loops over all the readers in the vector, applying the given routine.
  * The loop continues until the result of the routine is true for any reader

src/cpp/rtps/writer/StatelessWriter.hpp

@@ -46,7 +46,7 @@ class RTPSMessageGroup;
  * Class StatelessWriter, specialization of BaseWriter that manages writers that don't keep state of the matched readers.
  * @ingroup WRITER_MODULE
  */
-class StatelessWriter : public fastdds::rtps::BaseWriter
+class StatelessWriter : public BaseWriter
 {
     friend class RTPSParticipantImpl;
     friend class RTPSMessageGroup;
@@ -57,7 +57,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter
             RTPSParticipantImpl* participant,
             const GUID_t& guid,
             const WriterAttributes& attributes,
-            fastdds::rtps::FlowController* flow_controller,
+            FlowController* flow_controller,
             WriterHistory* history,
             WriterListener* listener = nullptr);
 
@@ -118,7 +118,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter
      *                (i.e. treat all samples as relevant).
      */
     void reader_data_filter(
-            fastdds::rtps::IReaderDataFilter* filter) final
+            IReaderDataFilter* filter) final
     {
         reader_data_filter_ = filter;
     }
@@ -128,7 +128,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter
      *
      * @return The content filter used on this writer.
      */
-    const fastdds::rtps::IReaderDataFilter* reader_data_filter() const final
+    const IReaderDataFilter* reader_data_filter() const final
     {
         return reader_data_filter_;
     }
@@ -183,7 +183,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter
      * @param max_blocking_time_point Future timepoint where blocking send should end.
      */
     bool send_nts(
-            const std::vector<eprosima::fastdds::rtps::NetworkBuffer>& buffers,
+            const std::vector<NetworkBuffer>& buffers,
             const uint32_t& total_bytes,
             const LocatorSelectorSender& locator_selector,
             std::chrono::steady_clock::time_point& max_blocking_time_point) const override;
@@ -202,7 +202,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter
 
     /*!
      * Tells writer the sample can be sent to the network.
-     * This function should be used by a fastdds::rtps::FlowController.
+     * This function should be used by a FlowController.
      *
      * @param cache_change Pointer to the CacheChange_t that represents the sample which can be sent.
      * @param group RTPSMessageGroup reference uses for generating the RTPS message.
@@ -271,7 +271,7 @@ class StatelessWriter : public fastdds::rtps::BaseWriter
 
     LocatorSelectorSender locator_selector_;
 
-    fastdds::rtps::IReaderDataFilter* reader_data_filter_ = nullptr;
+    IReaderDataFilter* reader_data_filter_ = nullptr;
 };
 
 } // namespace rtps

test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp

@@ -32,7 +32,7 @@ namespace rtps {
 class RTPSParticipantImpl;
 class ReaderProxy;
 
-class StatefulWriter : public fastdds::rtps::BaseWriter
+class StatefulWriter : public BaseWriter
 {
 public:
 
@@ -99,12 +99,12 @@ class StatefulWriter : public fastdds::rtps::BaseWriter
     }
 
     void reader_data_filter(
-            fastdds::rtps::IReaderDataFilter* filter)
+            IReaderDataFilter* filter)
     {
         reader_data_filter_ = filter;
     }
 
-    const fastdds::rtps::IReaderDataFilter* reader_data_filter() const
+    const IReaderDataFilter* reader_data_filter() const
     {
         return reader_data_filter_;
     }
@@ -128,7 +128,7 @@ class StatefulWriter : public fastdds::rtps::BaseWriter
 
     WriterHistory* mp_history;
 
-    fastdds::rtps::IReaderDataFilter* reader_data_filter_;
+    IReaderDataFilter* reader_data_filter_;
 
 };
 

test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp

@@ -29,7 +29,7 @@ namespace rtps {
 
 class RTPSParticipantImpl;
 
-class StatelessWriter : public fastdds::rtps::BaseWriter
+class StatelessWriter : public BaseWriter
 {
 public: