Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes

- Merged 292 changed files from dlbo snapshot
- Fixed IDL enum collisions (PortType, PdmEventType)
- Fixed Grantlee template for C++11 scoped enums
- Fixed CMake VERSION_GREATER syntax
- Added missing directories (THP, LtsRestClient, etc.)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Lts/Common/CMakeLists.txt

@@ -6,30 +6,28 @@
 
 ADD_SUBDIRECTORY(CodeGen)
 ADD_SUBDIRECTORY(httq)
-#ADD_SUBDIRECTORY(LtsBotan)
-ADD_SUBDIRECTORY(LtsCommandLineParser)
-ADD_SUBDIRECTORY(LtsCoordTrans)
-ADD_SUBDIRECTORY(LtsCoordinate)
-ADD_SUBDIRECTORY(LtsElevation)
-ADD_SUBDIRECTORY(LtsLicence)
-ADD_SUBDIRECTORY(LtsPluginManager)
-ADD_SUBDIRECTORY(LtsSession)
-ADD_SUBDIRECTORY(LtsUtils)
-ADD_SUBDIRECTORY(LtsWidgets)
 ADD_SUBDIRECTORY(LtsAppDescriptor)
 ADD_SUBDIRECTORY(LtsAppManager)
-ADD_SUBDIRECTORY(LtsMultiMonitor)
+ADD_SUBDIRECTORY(LtsCommandLineParser)
+ADD_SUBDIRECTORY(LtsCoordinate)
+ADD_SUBDIRECTORY(LtsCoordTrans)
+ADD_SUBDIRECTORY(LtsElevation)
+ADD_SUBDIRECTORY(LtsLicence)
 ADD_SUBDIRECTORY(LtsLogin)
+ADD_SUBDIRECTORY(LtsMultiMonitor)
 ADD_SUBDIRECTORY(LtsNotification)
-ADD_SUBDIRECTORY(LtsTimeline)
+ADD_SUBDIRECTORY(LtsPluginManager)
 ADD_SUBDIRECTORY(LtsPrinting)
-ADD_SUBDIRECTORY(LtsSerialPortQuerry)
-ADD_SUBDIRECTORY(LtsScriptTimeline)
-ADD_SUBDIRECTORY(LtsWebSocket)
 ADD_SUBDIRECTORY(LtsProjectionWorkstation)
+ADD_SUBDIRECTORY(LtsRestClient)
+ADD_SUBDIRECTORY(LtsScriptTimeline)
+ADD_SUBDIRECTORY(LtsSerialPortQuerry)
+ADD_SUBDIRECTORY(LtsSession)
+ADD_SUBDIRECTORY(LtsTimeline)
+ADD_SUBDIRECTORY(LtsUtils)
 ADD_SUBDIRECTORY(LtsVirtualKeyboard)
+ADD_SUBDIRECTORY(LtsWebSocket)
+ADD_SUBDIRECTORY(LtsWidgets)
 ADD_SUBDIRECTORY(PluginInterfaces)
 ADD_SUBDIRECTORY(ProjectConfig)
-ADD_SUBDIRECTORY(TopicEditorBase) # TODO: rename / move ?
-#ADD_SUBDIRECTORY(LtsEventTimeline)
-#ADD_SUBDIRECTORY(LtsTranslator)
+ADD_SUBDIRECTORY(TopicEditorBase)

Lts/Common/CodeGen/svc_translation.cpp.grantlee

@@ -22,7 +22,7 @@ QString toString({{ idl_enum.name }} state)
 {
   switch(state.underlying())
   {{% for idl_member in idl_enum.member %}
-  case {{ idl_enum.name }}::{{ idl_member.key }}: return QCoreApplication::translate("{{ idl_enum.name }}", "{{ idl_member.key }}");
+  case {{ idl_enum.name }}_def::{{ idl_member.key }}: return QCoreApplication::translate("{{ idl_enum.name }}", "{{ idl_member.key }}");
   {% endfor %}
   default: break;
   }

Lts/Common/LtsAppDescriptor/lts_app_descriptor.h

@@ -61,6 +61,7 @@ struct PluginInfo
     UNKNOWN,
     DATA,
     GUI,
+    GUI_ELEMENT,
   };
 
   enum class Flag

Lts/Common/LtsPluginManager/lts_plugin_loader.cpp

@@ -258,7 +258,8 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
                                         QStringLiteral("topic_type"),
                                         QStringLiteral("project"),
                                         QStringLiteral("style"),
-                                        QStringLiteral("special")}); // #warning TODO: recordreplay is a data plugin ?
+                                        QStringLiteral("special"),
+                                        QStringLiteral("gui_element")}); // #warning TODO: recordreplay is a data plugin ?
 
   QDirIterator pluginDir(libPath, nameFilter, QDir::Files);
   while (pluginDir.hasNext())
@@ -335,6 +336,9 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
     case 5: // special
       pluginType = PluginType::SPECIAL;
       break;
+    case 6: // gui_element
+      pluginType = PluginType::GUI_ELEMENT;
+      break;
     default:
       break;
     }

Lts/Common/LtsPluginManager/lts_plugin_loader.h

@@ -49,6 +49,8 @@ enum class PluginType
   PROJECT,
   STYLE,
   SPECIAL, // TODO: rm
+  GUI_ELEMENT,
+
 };
 
 

Lts/Common/LtsRestClient/CMakeLists.txt

@@ -0,0 +1,27 @@
+#
+# Lightweight REST Client Framework
+# $Id$
+# $HeadURL$
+# $Author$
+# Created by Hannes Fritsche, ESZS, 2026-08-21
+
+#
+# --- Library LtsRestClient --------------------------------------------------------------------------------
+#
+SET(LtsRestClient_SRCS
+  lts_rest_client.cpp
+  lts_rest_client.h
+)
+
+NGL_ADD_LIBRARY2(ALL LtsRestClient SHARED ${LtsRestClient_SRCS})
+
+NGL_TARGET_INCLUDE_DIRECTORIES(LtsRestClient
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+)
+
+NGL_TARGET_LINK_LIBRARIES(LtsRestClient
+  PUBLIC
+  Qt5::Core
+  Qt5::Network
+)

Lts/Common/LtsRestClient/lts_rest_client.cpp

@@ -0,0 +1,172 @@
+/**
+ * Lightweight REST Client Framework
+ * $Id$
+ * $HeadURL$
+ * $Author$
+ * Created by Hannes Fritsche, ESZS, 2026-08-21
+ */
+
+#include "lts_rest_client.h"
+#include <QTimer>
+#include <QUrl>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+
+namespace LtsCommon
+{
+
+LtsRestClient::LtsRestClient(const QString &baseUrl, QObject *parent)
+  : QObject(parent)
+  , m_baseUrl(baseUrl)
+  , m_manager(new QNetworkAccessManager(this))
+{
+}
+
+void LtsRestClient::ping(PingSuccessCallback onSuccess, ErrorCallback onError, int timeoutMs)
+{
+  const QNetworkRequest request((QUrl(m_baseUrl)));
+  QNetworkReply *reply = m_manager->head(request);
+
+  if (!reply)
+  {
+    if (onError)
+      onError(QStringLiteral("Failed to initiate ping."));
+
+    return;
+  }
+
+  // 1. Setup the timer (parented to reply for auto-cleanup)
+  QTimer *timeoutTimer = new QTimer(reply);
+  timeoutTimer->setSingleShot(true);
+
+  // 2. Connect the timeout signal to abort the request
+  connect(timeoutTimer, &QTimer::timeout, this, [reply]()
+  {
+    if (reply && reply->isRunning())
+      reply->abort(); // Triggers finished() with OperationCanceledError
+  });
+
+  // 3. Connect the finished signal to handle the response
+  connect(reply,
+          &QNetworkReply::finished,
+          this,
+          [reply, timeoutTimer, onSuccess, onError]()
+  {
+    timeoutTimer->stop();
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError)
+    {
+      if (onError)
+      {
+        if (reply->error() == QNetworkReply::OperationCanceledError)
+          onError(QStringLiteral("Ping timed out."));
+        else
+          onError(reply->errorString());
+      }
+
+      return;
+    }
+
+    const int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+
+    if (onSuccess)
+      onSuccess(statusCode);
+  });
+
+  // 4. Start the timer only after all connections are successfully established
+  timeoutTimer->start(timeoutMs);
+}
+
+void LtsRestClient::get(const QString &endpoint, SuccessCallback onSuccess, ErrorCallback onError)
+{
+  sendRequest(QStringLiteral("GET"), endpoint, QByteArray(), onSuccess, onError);
+}
+
+void LtsRestClient::post(const QString &endpoint, const QJsonDocument &json, SuccessCallback onSuccess, ErrorCallback onError)
+{
+  sendRequest(QStringLiteral("POST"), endpoint, json.toJson(), onSuccess, onError);
+}
+
+void LtsRestClient::put(const QString &endpoint, const QJsonDocument &json, SuccessCallback onSuccess, ErrorCallback onError)
+{
+  sendRequest(QStringLiteral("PUT"), endpoint, json.toJson(), onSuccess, onError);
+}
+
+void LtsRestClient::del(const QString &endpoint, SuccessCallback onSuccess, ErrorCallback onError)
+{
+  sendRequest(QStringLiteral("DELETE"), endpoint, QByteArray(), onSuccess, onError);
+}
+
+void LtsRestClient::sendRequest(const QString &method, const QString &endpoint, const QByteArray &data, SuccessCallback onSuccess, ErrorCallback onError)
+{
+  QUrl url(m_baseUrl);
+  url.setPath(url.path() + endpoint);
+
+  QNetworkRequest request(url);
+  request.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
+
+  QNetworkReply *reply = nullptr;
+
+  if (method == QStringLiteral("GET"))
+    reply = m_manager->get(request);
+  else if (method == QStringLiteral("POST"))
+    reply = m_manager->post(request, data);
+  else if (method == QStringLiteral("PUT"))
+    reply = m_manager->put(request, data);
+  else if (method == QStringLiteral("DELETE"))
+    reply = m_manager->deleteResource(request);
+
+  if (!reply)
+  {
+    if (onError)
+      onError(QStringLiteral("Failed to initiate request."));
+
+    return;
+  }
+
+  connect(reply,
+          &QNetworkReply::finished,
+          this,
+          [reply, onSuccess, onError]()
+  {
+    reply->deleteLater();
+
+    // Handle network errors
+    if (reply->error() != QNetworkReply::NoError)
+    {
+      if (onError)
+        onError(reply->errorString());
+
+      return;
+    }
+
+    // Handle HTTP errors
+    const int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    if (statusCode >= 400)
+    {
+      if (onError)
+        onError(QStringLiteral("HTTP Error %1").arg(statusCode));
+
+      return;
+    }
+
+    // Parse JSON safely
+    QJsonParseError parseError;
+    const QJsonDocument doc = QJsonDocument::fromJson(reply->readAll(), &parseError);
+
+    if (parseError.error != QJsonParseError::NoError)
+    {
+      if (onError)
+        onError(QStringLiteral("JSON Parse Error: ") + parseError.errorString());
+
+      return;
+    }
+
+    if (onSuccess)
+      onSuccess(doc);
+  });
+}
+
+} // namespace LtsCommon

Lts/Common/LtsRestClient/lts_rest_client.h

@@ -0,0 +1,51 @@
+/**
+ * Lightweight REST Client Framework
+ * $Id$
+ * $HeadURL$
+ * $Author$
+ * Created by Hannes Fritsche, ESZS, 2026-08-21
+ */
+
+// Short documentation on how to use it can be found at https://confluence-classified.rh-int.de/spaces/LEG/pages/207915647/HOWTO+LtsRestClient
+
+#pragma once
+
+#include <QJsonDocument>
+#include <QObject>
+#include <QString>
+#include <functional>
+#include <LtsRestClient/ltsrestclient_export.h>
+
+class QNetworkAccessManager;
+
+namespace LtsCommon
+{
+
+class LTSRESTCLIENT_EXPORT LtsRestClient : public QObject
+{
+  Q_OBJECT
+
+  public:
+  explicit LtsRestClient(const QString &baseUrl, QObject *parent = nullptr);
+
+  // type aliases
+  using PingSuccessCallback = std::function<void(int statusCode)>;
+  using SuccessCallback = std::function<void(const QJsonDocument &)>;
+  using ErrorCallback = std::function<void(const QString &)>;
+
+  // HTTP Header Ping to m_baseUrl to check server availability
+  void ping(PingSuccessCallback onSuccess, ErrorCallback onError = nullptr, int timeoutMs = 3000);
+
+  // HTTP Methods
+  void get(const QString &endpoint, SuccessCallback onSuccess, ErrorCallback onError = nullptr);
+  void post(const QString &endpoint, const QJsonDocument &json, SuccessCallback onSuccess, ErrorCallback onError = nullptr);
+  void put(const QString &endpoint, const QJsonDocument &json, SuccessCallback onSuccess, ErrorCallback onError = nullptr);
+  void del(const QString &endpoint, SuccessCallback onSuccess, ErrorCallback onError = nullptr);
+
+  private:
+  void sendRequest(const QString &method, const QString &endpoint, const QByteArray &data, SuccessCallback onSuccess, ErrorCallback onError);
+
+  QString m_baseUrl;
+  QNetworkAccessManager *m_manager;
+}; // class RestClient
+} // namespace LtsCommon

Lts/Common/LtsSession/lts_session_data_dds.h

@@ -14,7 +14,7 @@
 #include <QMap>
 #include <QUrl>
 #include <memory>
-#include <Core/core_dtc_types.h>
+#include <DDS/Core/core_dtc_types.h>
 //#include <NGLLogger/INGLLogger.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <Common/ProjectConfig/project_defines.h>

Lts/Common/LtsSession/lts_session_lock_handler.h

@@ -2,7 +2,7 @@
 
 #include <LtsSession/ltssession_export.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <Core/core_ftc.h>
+#include <DDS/Core/core_ftc.h>
 
 #include <QPointer>
 #include <memory>

Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h

@@ -15,8 +15,8 @@
 #define LTSUTILSGUIDDS_INTERNAL_EXPORT LTSUTILSDDS_EXPORT
 #endif
 
-#include <Core/function_reply_object.h>
-#include <Core/core.hpp> // Core::FunctionReply (base reply)
+#include <DDS/Core/function_reply_object.h>
+#include <DDS/Core/core.hpp> // Core::FunctionReply (base reply)
 
 #include <QObject>
 #include <QVector>

Lts/Common/LtsWidgets/CMakeLists.txt

@@ -108,6 +108,8 @@ SET(ltswidgets_SRCS
     lts_text_editor2.h
     lts_text_editor2.cpp
 
+
+
     LtsImageCropper/lts_image_cropper.cpp
 )
 
@@ -148,6 +150,7 @@ NGL_WRAP_UI(ltswidgets_SRCS
 NGL_ADD_BIG_RESOURCES(ltswidgets_SRCS resources/lts_resources.qrc)
 NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
 
+
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../