Adds immediate migration results

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

@@ -3,9 +3,11 @@
 
 #include "GrantleeWrappers.h"
 #include <NGLLogger/NGLLoggerBootstrap.h>
+#include <utility>
 
 using namespace CodeGen;
 
+#ifdef RTI_HEADER_AVAILABLE
 QString IdlStructWrapper::extensibility2String(dds::core::xtypes::ExtensibilityKind extensiblity)
 {
   switch (extensiblity.underlying())
@@ -20,6 +22,13 @@ QString IdlStructWrapper::extensibility2String(dds::core::xtypes::ExtensibilityK
   Q_ASSERT_X(false, "IdlStructWrapper::extensibility2String", "Unknown extensiblity kind");
   return QString();
 }
+#else
+QString IdlStructWrapper::extensibility2String(int /*extensiblity*/)
+{
+  // RTI not available - return placeholder
+  return QStringLiteral("EXTENSIBLE_EXTENSIBILITY");
+}
+#endif
 
 QString DataTopicWrapper::typeFq() const
 {
@@ -51,29 +60,44 @@ QString MemberInformationWrapper::ddsToJsonElement() const
 {
   
   
+  
 
   
   
+  
 
   
   
+  
 
   if (cppMemberName().isEmpty())
     return QStringLiteral("obj[QStringLiteral(\"") + cppType() + QStringLiteral("\")] = element;");
 
+  const QString memberAccess = isCppStruct() ? cppMemberName() : cppMemberName() + QStringLiteral("()");
   if (!isOptional())
     return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") +
-        cppToJsonPre() + QStringLiteral("element.") + cppMemberName() + QStringLiteral("()") + cppToJsonPost();
+        cppToJsonPre() + QStringLiteral("element.") + memberAccess + cppToJsonPost();
 
-  return QStringLiteral("if (element.") + cppMemberName() + QStringLiteral("().is_set()) ") +
+  const QString optionalAccess = isCppStruct() ? cppMemberName() + QStringLiteral(".is_set()") : cppMemberName() + QStringLiteral("().is_set()");
+  const QString getValue = isCppStruct() ? cppMemberName() : cppMemberName() + QStringLiteral("()");
+  return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
       QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") +
-      cppToJsonPre() + QStringLiteral("element.") + cppMemberName() + QStringLiteral("().get()") + cppToJsonPost();
+      cppToJsonPre() + QStringLiteral("element.") + getValue + cppToJsonPost();
 }
 
 QString MemberInformationWrapper::jsonElementToDds() const
 {
   
   
+  
+
+  
+  
+  
+
+  
+  
+  
 
   
   
@@ -81,10 +105,6 @@ QString MemberInformationWrapper::jsonElementToDds() const
   
   
 
-  
-  
-
-  
   if (cppMemberName().isEmpty())
     return QStringLiteral("element = ") +
         cppFromQvPre2() + QStringLiteral("objElement.value(QStringLiteral(\"") + cppType() + QStringLiteral("\"))") + cppFromJsonPost();
@@ -93,8 +113,12 @@ QString MemberInformationWrapper::jsonElementToDds() const
   if (isOptional())
     ret += QStringLiteral("if (!val.isNull()) ");
 
-  ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral("(") +
-      cppFromJsonPre2() + QStringLiteral("val") + cppFromJsonPost() + QStringLiteral(")");
+  if (isCppStruct())
+    ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral(" = ") +
+        cppFromJsonPre2() + QStringLiteral("val") + cppFromJsonPost();
+  else
+    ret += QStringLiteral("element.") + cppMemberName() + QStringLiteral("(") +
+        cppFromJsonPre2() + QStringLiteral("val") + cppFromJsonPost() + QStringLiteral(")");
 
   return ret;
 }
@@ -165,7 +189,7 @@ QVariantList DbStructWrapper::insertStructures()
   QMap<QString, MemberInformationWrapper *> fkComplexTableKeys;
   
   tableNames.reserve(5);
-  for (const QVariant &v : qAsConst(m_member))
+  for (const QVariant &v : std::as_const(m_member))
   {
     MemberInformationWrapper *mi = v.value<MemberInformationWrapper *>();
     const QString &tableName = mi->info().db.table;