Adapts codegen templates to rtiddsgen 7.7 plain data members

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.h

@@ -484,7 +484,9 @@ class IdlDataWrapper final : public NameWrapper
 
     QString nameGetter() const
     {
-        return m_data.name + (m_data.isOptional ? QStringLiteral("().get") : QString());
+        // rtiddsgen 7.7 generates public data members (no getters); optional
+        // members are omg::types::optional<T> and are unwrapped via .get().
+        return m_data.name + (m_data.isOptional ? QStringLiteral(".get()") : QString());
     }
 
   private:

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee

@@ -215,7 +215,7 @@ bool DtcImpl::waitForHistoricalData{{ dt.name }}(int timeoutMSec)
 template <>
 {{ dt.key.cppType }} getKey(const {{ dt.type }} &val)
 {
-  return val.{{ dt.key.name }}();
+  return val.{{ dt.key.name }};
 }
 
 QMap<{{ dt.key.cppType }},::{{ namespace }}::{{ dt.type }}> DtcImpl::{{ dt.nameFlc }}s()

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dts_impl.cpp.grantlee

@@ -89,7 +89,9 @@ bool DtsImpl::remove{{ dt.name }}ByKey({{ dt.key.cppTypeCr }} {{ dt.key.nameFlc
     return false;
   }
   {{ namespace }}::{{ dt.name }} data;
-  data.{{ dt.key.name }}({{ dt.key.name }});
+  // rtiddsgen -stl generates plain public data members, so the key is
+  // assigned directly instead of the old setter call data.{{ dt.key.name }}(...).
+  data.{{ dt.key.name }} = {{ dt.key.name }};
   return m_dts{{ dt.name }}->remove(data, errorMsgIfSampleDoesNotExists);
 }
 {% endif %}

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee

@@ -116,9 +116,9 @@ static T buildErrorReason(int reason, int requestId)
   }
 
   T reply;
-  reply.id(requestId);
-  reply.errorString(errString);
-  reply.errorParams(errArgs);
+  reply.id = requestId;
+  reply.errorString = errString;
+  reply.errorParams = errArgs;
   return reply;
 }
 
@@ -196,7 +196,7 @@ int64_t FtcImpl::{{ ft.requestFlc }}(const {{ ft.requestType }} &request, const
   const auto _reply = future.get(); // throws if exception set
 
   Core::FunctionReplyObject fro(
-    {% for rp in ft.replyParams %} _reply.{{ rp.nameGetter }}(){% if not forloop.last %},{% endif %} {% endfor %}
+    {% for rp in ft.replyParams %} _reply.{{ rp.nameGetter }}{% if not forloop.last %},{% endif %} {% endfor %}
   );
   fro.setUniqueId(m_last{{ ft.request }}UniqueId);
 
@@ -234,7 +234,7 @@ void FtcImpl::{{ ft.onReply }}(const {{ namespace }}::{{ ft.reply }} &reply, int
 {% if ft.isCoreFt %}
   Core::FunctionReplyObject fro(
       {% for rp in ft.replyParams %}
-      reply.{{ rp.nameGetter }}(){% if not forloop.last %},{% endif %} {% endfor %}
+      reply.{{ rp.nameGetter }}{% if not forloop.last %},{% endif %} {% endfor %}
   );
   fro.setUniqueId(m_last{{ ft.request }}UniqueId);
   cb(fro);