Fixes merge conflicts, but leaves out-of-DDS-scope build errors (tbc)

qt6-after/qt6-migrated-legatus/include/DDS/DTC/generic_dtc_impl.h

@@ -127,6 +127,17 @@ public:
     return ret;
   }
 
+  bool readAlive(TopicTypeRead& data) override final
+  {
+    auto samples = readAlive();
+    if (samples.length() > 0)
+    {
+      data = samples[0].data();
+      return true;
+    }
+    return false;
+  }
+
   dds::sub::LoanedSamples<TopicTypeRead> takeAlive() const override final
   {
     if (!m_dataReaderObject)
@@ -140,6 +151,17 @@ public:
     return ret;
   }
 
+  bool takeAlive(TopicTypeRead& data) override final
+  {
+    auto samples = takeAlive();
+    if (samples.length() > 0)
+    {
+      data = samples[0].data();
+      return true;
+    }
+    return false;
+  }
+
   dds::sub::LoanedSamples<TopicTypeRead> takeDisposed() const override final
   {
     if (!m_dataReaderObject)
@@ -148,6 +170,17 @@ public:
     return m_dataReaderObject->takeDisposed();
   }
 
+  bool takeDisposed(TopicTypeRead& data) override final
+  {
+    auto samples = takeDisposed();
+    if (samples.length() > 0)
+    {
+      data = samples[0].data();
+      return true;
+    }
+    return false;
+  }
+
   bool hasSamples() const override final
   {
     if (!m_dataReaderObject)