Adds initial intermediate qt6 porting state

qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Data/CMakeLists.txt

@@ -0,0 +1,20 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+# Created by Mike Wille, SLSE, 2016-09-06
+#
+
+#
+# Data Plugin
+#
+NGL_ADD_LIBRARY(WS MrkDataPlugin MODULE mrk_data_plugin.cpp mrk_data_plugin.h)
+NGL_TARGET_LINK_LIBRARIES(MrkDataPlugin
+  Qt5::Core
+  Qt5::Widgets #QColor/QApplication for trackentry
+  MrkDataPluginInterface
+  svcMrkClient
+  NGLLogger
+  LtsSessionDataDds
+)
+NGL_INSTALL_TARGET(MrkDataPlugin)

qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Data/mrk_data_plugin.cpp

@@ -0,0 +1,47 @@
+
+
+
+#include "mrk_data_plugin.h"
+#include <Plugins/MarkerManagement/mrk_gui_plugin_interface.h>
+#include <PluginInterfaces/data_plugin_interface.h>
+
+#include <DDS/DDSConnector/dds_connector.h>
+#include <LtsSession/lts_session_data_dds.h>
+
+
+namespace MarkerManagement
+{
+std::shared_ptr<DataPluginBase::Interface> DataPlugin::createDataInterface(LtsSession::LtsSessionDataDds *session)
+{
+  std::shared_ptr<MarkerManagement::Interface::Dtc> dtc;
+  std::shared_ptr<MarkerManagement::Interface::Ftc> ftc;
+  if (!session->createTopicClient(dtc, ftc))
+    return std::shared_ptr<DataPluginBase::Interface>();
+
+  return std::make_shared<DataInterfaceImpl>(dtc, ftc);
+}
+
+
+DataInterfaceImpl::DataInterfaceImpl(const std::shared_ptr<MarkerManagement::Interface::Dtc> &dtc,
+                                     const std::shared_ptr<MarkerManagement::Interface::Ftc> &ftc)
+  : DataInterface()
+  , m_dtc(dtc)
+  , m_ftc(ftc)
+  , m_foreignInterface(std::make_shared<ForeignInterfaceImpl>(dtc, ftc))
+{}
+
+
+
+ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<MarkerManagement::Interface::Dtc> &dtc,
+                                           const std::shared_ptr<MarkerManagement::Interface::Ftc> &ftc)
+  : m_dtc(dtc)
+  , m_ftc(ftc)
+{}
+
+bool ForeignInterfaceImpl::setMarker(const Marker &marker, Interface::Ftc::MarkerModifyReplyHandler *handler)
+{
+  return m_ftc->markerModifyRequest(marker, handler);
+}
+
+
+} 

qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Data/mrk_data_plugin.h

@@ -0,0 +1,62 @@
+
+
+
+#pragma once
+
+#include <Plugins/MarkerManagement/mrk_data_plugin_interface.h>
+#include <PluginInterfaces/data_plugin_interface.h>
+
+namespace MarkerManagement
+{
+
+class DataPlugin final : public QObject, public DataPluginBase::Plugin
+{
+  Q_PLUGIN_METADATA(IID "data:3:mrk")
+  Q_INTERFACES(DataPluginBase::Plugin)
+
+  Q_OBJECT
+public:
+  DataPlugin() = default;
+  ~DataPlugin() = default;
+
+  QString pluginName() const override  { return QStringLiteral("MarkerManagement"); }
+  std::shared_ptr<DataPluginBase::Interface> createDataInterface(LtsSession::LtsSessionDataDds *session) override;
+  bool availableInPartition(IDL::PartitionType ) const override { return true; }
+};
+
+
+class DataInterfaceImpl final : public DataInterface
+{
+public:
+  DataInterfaceImpl(const std::shared_ptr<MarkerManagement::Interface::Dtc> &dtc,
+                    const std::shared_ptr<MarkerManagement::Interface::Ftc> &ftc);
+
+  std::shared_ptr<MarkerManagement::Interface::Dtc> getDtc() override { return m_dtc; }
+  std::shared_ptr<MarkerManagement::Interface::Ftc> getFtc() override { return m_ftc; }
+  std::shared_ptr<ForeignDataInterface> getForeignDataInterface() override { return m_foreignInterface; }
+
+
+private:
+  std::shared_ptr<MarkerManagement::Interface::Dtc> m_dtc;
+  std::shared_ptr<MarkerManagement::Interface::Ftc> m_ftc;
+  std::shared_ptr<ForeignDataInterface> m_foreignInterface;
+};
+
+class ForeignInterfaceImpl final : public QObject, public ForeignDataInterface
+{
+  Q_OBJECT
+public:
+  ForeignInterfaceImpl(const std::shared_ptr<MarkerManagement::Interface::Dtc> &dtc,
+                       const std::shared_ptr<MarkerManagement::Interface::Ftc> &ftc);
+
+  
+  bool setMarker(const Marker &marker, MarkerManagement::Interface::Ftc::MarkerModifyReplyHandler *handler) override;
+  std::shared_ptr<MarkerManagement::Interface::Dtc> getDtc() override { return m_dtc; }
+
+private:
+  std::shared_ptr<MarkerManagement::Interface::Dtc> m_dtc;
+  std::shared_ptr<MarkerManagement::Interface::Ftc> m_ftc;
+};
+
+
+}