[21159] Remove include/fastrtps

examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp

@@ -16,15 +16,16 @@
 #include <mutex>
 #include <vector>
 
+#include "CalculatorPubSubTypes.h"
+
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-
-#include "CalculatorPubSubTypes.h"
+#include <fastdds/rtps/common/WriteParams.h>
 
 class CalculatorClient
 {

examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp

@@ -16,15 +16,16 @@
 #include <mutex>
 #include <vector>
 
+#include "CalculatorPubSubTypes.h"
+
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-
-#include "CalculatorPubSubTypes.h"
+#include <fastdds/rtps/common/WriteParams.h>
 
 class CalculatorServer
 {

include/fastrtps/config/doxygen_modules.h → include/fastdds/config/doxygen_modules.hpp

@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file doxygen_modules.h
+ * @file doxygen_modules.hpp
  */
 
-#ifndef RTPS_DOXYGEN_MODULES_H_
-#define RTPS_DOXYGEN_MODULES_H_
+#ifndef _FASTDDS_DOXYGEN_MODULES_HPP_
+#define _FASTDDS_DOXYGEN_MODULES_HPP_
 
 //Description of doxygen modules, not used in actual code.
 
@@ -141,4 +141,4 @@
  *  @ingroup UTILITIES_MODULE
  */
 
-#endif /* RTPS_DOXYGEN_MODULES_H_ */
+#endif /* _FASTDDS_DOXYGEN_MODULES_HPP_ */

include/fastdds/dds/core/policy/ParameterTypes.hpp

@@ -1863,6 +1863,36 @@ T get_proxy_property(
 }
 
 } //namespace dds
+
+namespace rtps {
+
+using ParameterId_t = fastdds::dds::ParameterId_t;
+using Parameter_t = fastdds::dds::Parameter_t;
+using ParameterKey_t = fastdds::dds::ParameterKey_t;
+using ParameterLocator_t = fastdds::dds::ParameterLocator_t;
+using ParameterString_t = fastdds::dds::ParameterString_t;
+using ParameterPort_t = fastdds::dds::ParameterPort_t;
+using ParameterGuid_t = fastdds::dds::ParameterGuid_t;
+using ParameterDomainId_t = fastdds::dds::ParameterDomainId_t;
+using ParameterProtocolVersion_t = fastdds::dds::ParameterProtocolVersion_t;
+using ParameterVendorId_t = fastdds::dds::ParameterVendorId_t;
+using ParameterIP4Address_t = fastdds::dds::ParameterIP4Address_t;
+using ParameterBool_t = fastdds::dds::ParameterBool_t;
+using ParameterStatusInfo_t = fastdds::dds::ParameterStatusInfo_t;
+using ParameterCount_t = fastdds::dds::ParameterCount_t;
+using ParameterEntityId_t = fastdds::dds::ParameterEntityId_t;
+using ParameterTime_t = fastdds::dds::ParameterTime_t;
+using ParameterBuiltinEndpointSet_t = fastdds::dds::ParameterBuiltinEndpointSet_t;
+using ParameterNetworkConfigSet_t = fastdds::dds::ParameterNetworkConfigSet_t;
+using ParameterPropertyList_t = fastdds::dds::ParameterPropertyList_t;
+using ParameterSampleIdentity_t = fastdds::dds::ParameterSampleIdentity_t;
+#if HAVE_SECURITY
+using ParameterToken_t = fastdds::dds::ParameterToken_t;
+using ParameterParticipantSecurityInfo_t = fastdds::dds::ParameterParticipantSecurityInfo_t;
+using ParameterEndpointSecurityInfo_t = fastdds::dds::ParameterEndpointSecurityInfo_t;
+#endif // if HAVE_SECURITY
+
+} //namespace rtps
 } //namespace fastdds
 } //namespace eprosima
 

include/fastdds/dds/publisher/Publisher.hpp

@@ -40,6 +40,12 @@ namespace fastdds {
 
 class TopicAttributes;
 
+namespace rtps {
+
+class IPayloadPool;
+
+} // namespace rtps
+
 namespace dds {
 
 class DomainParticipant;

include/fastdds/dds/subscriber/Subscriber.hpp

@@ -43,9 +43,12 @@ namespace fastdds {
 
 class TopicAttributes;
 
-} // namespace fastdds
+namespace rtps {
+
+class IPayloadPool;
+
+} // namespace rtps
 
-namespace fastdds {
 namespace dds {
 
 class DomainParticipant;

include/fastdds/rtps/attributes/TopicAttributes.h

@@ -16,14 +16,13 @@
  * @file TopicAttributes.h
  */
 
-#ifndef TOPICPARAMETERS_H_
-#define TOPICPARAMETERS_H_
+#ifndef _FASTDDS_TOPICPARAMETERS_H_
+#define _FASTDDS_TOPICPARAMETERS_H_
 
 #include <string>
 
+#include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/common/Types.h>
-#include <fastrtps/qos/QosPolicies.h>
-
 
 namespace eprosima {
 namespace fastdds {
@@ -104,15 +103,15 @@ class TopicAttributes
     //!Topic Data Type.
     fastcdr::string_255 topicDataType;
     //!QOS Regarding the History to be saved.
-    HistoryQosPolicy historyQos;
+    dds::HistoryQosPolicy historyQos;
     //!QOS Regarding the resources to allocate.
-    ResourceLimitsQosPolicy resourceLimitsQos;
+    dds::ResourceLimitsQosPolicy resourceLimitsQos;
     //!Type Identifier XTYPES 1.1
-    TypeIdV1 type_id;
+    dds::TypeIdV1 type_id;
     //!Type Object XTYPES 1.1
-    TypeObjectV1 type;
+    dds::TypeObjectV1 type;
     //!XTYPES 1.2
-    xtypes::TypeInformationParameter type_information;
+    dds::xtypes::TypeInformationParameter type_information;
 
     /**
      * Method to check whether the defined QOS are correct.
@@ -137,7 +136,7 @@ bool inline operator !=(
             || t1.topicName != t2.topicName
             || t1.topicDataType != t2.topicDataType
             || t1.historyQos.kind != t2.historyQos.kind
-            || (t1.historyQos.kind == KEEP_LAST_HISTORY_QOS && t1.historyQos.depth != t2.historyQos.depth))
+            || (t1.historyQos.kind == dds::KEEP_LAST_HISTORY_QOS && t1.historyQos.depth != t2.historyQos.depth))
     {
         return true;
     }
@@ -149,4 +148,4 @@ bool inline operator !=(
 } /* namespace fastdds */
 } /* namespace eprosima */
 
-#endif /* TOPICPARAMETERS_H_ */
+#endif /* _FASTDDS_TOPICPARAMETERS_H_ */

include/fastdds/rtps/builtin/data/ReaderProxyData.h

@@ -305,22 +305,22 @@ class ReaderProxyData
     }
 
     FASTDDS_EXPORTED_API void type_id(
-            const TypeIdV1& other_type_id)
+            const dds::TypeIdV1& other_type_id)
     {
         type_id() = other_type_id;
     }
 
-    FASTDDS_EXPORTED_API const TypeIdV1& type_id() const
+    FASTDDS_EXPORTED_API const dds::TypeIdV1& type_id() const
     {
         assert(m_type_id != nullptr);
         return *m_type_id;
     }
 
-    FASTDDS_EXPORTED_API TypeIdV1& type_id()
+    FASTDDS_EXPORTED_API dds::TypeIdV1& type_id()
     {
         if (m_type_id == nullptr)
         {
-            m_type_id = new TypeIdV1();
+            m_type_id = new dds::TypeIdV1();
         }
         return *m_type_id;
     }
@@ -331,22 +331,22 @@ class ReaderProxyData
     }
 
     FASTDDS_EXPORTED_API void type(
-            const TypeObjectV1& other_type)
+            const dds::TypeObjectV1& other_type)
     {
         type() = other_type;
     }
 
-    FASTDDS_EXPORTED_API const TypeObjectV1& type() const
+    FASTDDS_EXPORTED_API const dds::TypeObjectV1& type() const
     {
         assert(m_type != nullptr);
         return *m_type;
     }
 
-    FASTDDS_EXPORTED_API TypeObjectV1& type()
+    FASTDDS_EXPORTED_API dds::TypeObjectV1& type()
     {
         if (m_type == nullptr)
         {
-            m_type = new TypeObjectV1();
+            m_type = new dds::TypeObjectV1();
         }
         return *m_type;
     }
@@ -357,22 +357,22 @@ class ReaderProxyData
     }
 
     FASTDDS_EXPORTED_API void type_information(
-            const xtypes::TypeInformationParameter& other_type_information)
+            const dds::xtypes::TypeInformationParameter& other_type_information)
     {
         type_information() = other_type_information;
     }
 
-    FASTDDS_EXPORTED_API const xtypes::TypeInformationParameter& type_information() const
+    FASTDDS_EXPORTED_API const dds::xtypes::TypeInformationParameter& type_information() const
     {
         assert(m_type_information != nullptr);
         return *m_type_information;
     }
 
-    FASTDDS_EXPORTED_API xtypes::TypeInformationParameter& type_information()
+    FASTDDS_EXPORTED_API dds::xtypes::TypeInformationParameter& type_information()
     {
         if (m_type_information == nullptr)
         {
-            m_type_information = new xtypes::TypeInformationParameter();
+            m_type_information = new dds::xtypes::TypeInformationParameter();
         }
         return *m_type_information;
     }
@@ -502,11 +502,11 @@ class ReaderProxyData
     //!Topic kind
     TopicKind_t m_topicKind;
     //!Type Identifier
-    TypeIdV1* m_type_id;
+    dds::TypeIdV1* m_type_id;
     //!Type Object
-    TypeObjectV1* m_type;
+    dds::TypeObjectV1* m_type;
     //!Type Information
-    xtypes::TypeInformationParameter* m_type_information;
+    dds::xtypes::TypeInformationParameter* m_type_information;
     //!
     ParameterPropertyList_t m_properties;
     //!Information on the content filter applied by the reader.

include/fastdds/rtps/builtin/data/WriterProxyData.h

@@ -310,22 +310,22 @@ class WriterProxyData
     }
 
     FASTDDS_EXPORTED_API void type_id(
-            const TypeIdV1& other_type_id)
+            const dds::TypeIdV1& other_type_id)
     {
         type_id() = other_type_id;
     }
 
-    FASTDDS_EXPORTED_API const TypeIdV1& type_id() const
+    FASTDDS_EXPORTED_API const dds::TypeIdV1& type_id() const
     {
         assert(m_type_id != nullptr);
         return *m_type_id;
     }
 
-    FASTDDS_EXPORTED_API TypeIdV1& type_id()
+    FASTDDS_EXPORTED_API dds::TypeIdV1& type_id()
     {
         if (m_type_id == nullptr)
         {
-            m_type_id = new TypeIdV1();
+            m_type_id = new dds::TypeIdV1();
         }
         return *m_type_id;
     }
@@ -336,22 +336,22 @@ class WriterProxyData
     }
 
     FASTDDS_EXPORTED_API void type(
-            const TypeObjectV1& other_type)
+            const dds::TypeObjectV1& other_type)
     {
         type() = other_type;
     }
 
-    FASTDDS_EXPORTED_API const TypeObjectV1& type() const
+    FASTDDS_EXPORTED_API const dds::TypeObjectV1& type() const
     {
         assert(m_type != nullptr);
         return *m_type;
     }
 
-    FASTDDS_EXPORTED_API TypeObjectV1& type()
+    FASTDDS_EXPORTED_API dds::TypeObjectV1& type()
     {
         if (m_type == nullptr)
         {
-            m_type = new TypeObjectV1();
+            m_type = new dds::TypeObjectV1();
         }
         return *m_type;
     }
@@ -362,22 +362,22 @@ class WriterProxyData
     }
 
     FASTDDS_EXPORTED_API void type_information(
-            const xtypes::TypeInformationParameter& other_type_information)
+            const dds::xtypes::TypeInformationParameter& other_type_information)
     {
         type_information() = other_type_information;
     }
 
-    FASTDDS_EXPORTED_API const xtypes::TypeInformationParameter& type_information() const
+    FASTDDS_EXPORTED_API const dds::xtypes::TypeInformationParameter& type_information() const
     {
         assert(m_type_information != nullptr);
         return *m_type_information;
     }
 
-    FASTDDS_EXPORTED_API xtypes::TypeInformationParameter& type_information()
+    FASTDDS_EXPORTED_API dds::xtypes::TypeInformationParameter& type_information()
     {
         if (m_type_information == nullptr)
         {
-            m_type_information = new xtypes::TypeInformationParameter();
+            m_type_information = new dds::xtypes::TypeInformationParameter();
         }
         return *m_type_information;
     }
@@ -496,13 +496,13 @@ class WriterProxyData
     GUID_t persistence_guid_;
 
     //!Type Identifier
-    TypeIdV1* m_type_id;
+    dds::TypeIdV1* m_type_id;
 
     //!Type Object
-    TypeObjectV1* m_type;
+    dds::TypeObjectV1* m_type;
 
     //!Type Information
-    xtypes::TypeInformationParameter* m_type_information;
+    dds::xtypes::TypeInformationParameter* m_type_information;
 
     //!
     ParameterPropertyList_t m_properties;

include/fastdds/rtps/writer/RTPSWriter.h

@@ -469,7 +469,7 @@ class RTPSWriter
      *
      * @return Liveliness kind
      */
-    const LivelinessQosPolicyKind& get_liveliness_kind() const;
+    const dds::LivelinessQosPolicyKind& get_liveliness_kind() const;
 
     /**
      * @brief A method to retrieve the liveliness lease duration
@@ -550,7 +550,7 @@ class RTPSWriter
     bool m_separateSendingEnabled = false;
 
     //! The liveliness kind of this writer
-    LivelinessQosPolicyKind liveliness_kind_;
+    dds::LivelinessQosPolicyKind liveliness_kind_;
     //! The liveliness lease duration of this writer
     Duration_t liveliness_lease_duration_;
     //! The liveliness announcement period