Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
@@ -9,10 +9,9 @@
 namespace AdvancedSymbology
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:asb")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -37,6 +37,8 @@ QT5_ADD_RESOURCES(symboleditor_SRCS application.qrc)
 NGL_WRAP_UI(symboleditor_SRCS ${symboleditor_UICS})

 NGL_ADD_LIBRARY(WS AsbSymEditGuiPlugin MODULE ${symboleditor_SRCS} ${symboleditor_UICS})
+set_target_properties(AsbSymEditGuiPlugin PROPERTIES AUTOUIC ON)
+set_target_properties(AsbSymEditGuiPlugin PROPERTIES AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/forms")
 NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
  NGLLogger
  LtsWidgets
@@ -13,10 +13,9 @@
 namespace AlarmManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:alm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace AreaEffectSimulation
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:aes")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace AssetManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:asm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -22,6 +22,7 @@ SET(avm_SRCS
 )

 NGL_ADD_LIBRARY(WS AvmDataPlugin MODULE ${avm_SRCS})
+set_target_properties(AvmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
  NGLLogger
  ngltranslator
@@ -23,10 +23,9 @@ class PlaybackApp;
 class PluginSettings;
 class StreamNameMapping;

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:avm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -48,7 +48,7 @@ AvailableStreamsModel::AvailableStreamsModel(const std::shared_ptr<Interface::Dt
                                             LtsSession::LtsSession* session, StreamNameMapping* streamNameMapping,
                                             QObject* parent, bool isAudio)
    : NGLTreeModel(parent, new NGLTreeItem(QVariant(), QIcon()), ,
-                   m_logger(NGL::NGLLoggerBootstrap::getLogger()){tr("Available Streams")}),
+                   m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Available Streams")}),
      m_isAudio(isAudio), m_avmDtc(avmDtc), m_ismDtc(ismDtc), m_session(session), m_streamNameMapping(streamNameMapping)
 {
    Q_ASSERT(ismDtc);
@@ -258,7 +258,7 @@ class AvmPlaybackMenu::TimeControl : public QObject

 QueryTimeline::QueryTimeline(const AvaStream& stream, const AvaTimePoint& start, const AvaTimePoint& end,
                             AvaControl* control)
-    : QObject(), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QObject(), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    connect(control, &AvaControl::queryTimelineResponse, this, &QueryTimeline::signalTimelineComplete);
    connect(control, &AvaControl::queryTimelineResponse, this, &QObject::deleteLater);
@@ -843,7 +843,7 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
    return result;
 }

-FPFDelegate::FPFDelegate(QObject* parent) : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+FPFDelegate::FPFDelegate(QObject* parent) : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -19,7 +19,7 @@ namespace AudioVideoManagement
 FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptr<Interface::Dtc>& avmDtc,
                                                 QSet<int>& allocatedDataSets, QWidget* parent)
    : QWidget(parent), m_ui(new Ui::FrequencyPlanningWidget), m_assignedFrequencySetDataIds(allocatedDataSets),
-      m_avmDtc(avmDtc), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+      m_avmDtc(avmDtc), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    m_ui->setupUi(this);

@@ -857,7 +857,7 @@ LoadFrequencyPlanningDialogModel::searchCnrConfig(const NGLTreeItem* parentItem,
 }

 DrawDelegate::DrawDelegate(QObject* parent)
-    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -36,7 +36,7 @@ static inline QString gStrSymbolFolderPath()

 BuildingViewerDdsController::BuildingViewerDdsController(CommunicationInterfaceInternal* connection,
                                                         VCtrl::ViewerInterface* viewerInterface)
-    : m_connection(connection), m_viewerInterface(viewerInterface), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : m_connection(connection), m_viewerInterface(viewerInterface), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -17,7 +17,7 @@ BuildingEditModel::BuildingEditModel(QObject* parent,
                                     const std::shared_ptr<InfrastructureManagement::Interface::Dtc>& ismDtc,
                                     const std::shared_ptr<Buildings::Interface::Dtc>& bldDtc)
    : NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
-                   m_logger(NGL::NGLLoggerBootstrap::getLogger()){
+                   m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){
                       tr("Selected Building"), QStringLiteral("Name (DEBUG)"),
                       QStringLiteral("MountingPointId (DEBUG)"), QStringLiteral("StructureElementId (DEBUG)"),
                       tr("Fortify Factor"), tr("Damage Percent")}),
@@ -7,7 +7,7 @@ namespace BuildingViewer
 ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s,
                             const TopicReplay::Interface::SituationReplayTime& replay, QObject* parent)
    : QObject(parent), m_actualReplayStart_ms(0), m_actualReplayEnd_ms(0), m_replayDuration_ms(0), m_startOffset_ms(0),
-      m_replayInfo(replay), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+      m_replayInfo(replay), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    DEBUG_LOG(m_logger) << "buildingTopicStart_s = " << buildingTopicStart_s
                        << ", buildingTopicEnd_s = " << buildingTopicEnd_s
@@ -19,7 +19,7 @@ namespace BuildingViewer
 {

 BdvPluginProvider::BdvPluginProvider(LtsSession::LtsSession* session, QObject* parent)
-    : PluginProvider(parent), m_session(session), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : PluginProvider(parent), m_session(session), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -9,10 +9,9 @@
 namespace Buildings
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:bld")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -60,7 +60,7 @@ namespace Buildings
 BldInfoDialog::BldInfoDialog(int bldEntityId, const QString& menuGroup, QWidget* parent)
    : InfoDialogBase(bldEntityId, menuGroup, QStringLiteral("BldInfoDialog"), LtsWidgets::ButtonCombination::CloseOnly,
                     parent),
-      m_ui(new Ui::BldInfoDialog), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+      m_ui(new Ui::BldInfoDialog), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << ", bldEntityId=" << bldEntityId;

@@ -12,7 +12,7 @@ namespace Buildings

 RelayInfoWidget::RelayInfoWidget(int id, QWidget* parent)
    : QWidget(parent), m_id(id), m_state(false), m_ui(new Ui::RelayInfoWidget),
-      m_logger(NGL::NGLLoggerBootstrap::getLogger())
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    DEBUG_LOG(m_logger) << "RelayInfoWidget";
    m_ui->setupUi(this);
@@ -10,10 +10,9 @@
 namespace CentralEffectSimulation
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:ces")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -13,10 +13,9 @@
 namespace CodificationManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:cod")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -7,7 +7,7 @@
 using namespace CodificationManagement;

 CodeTableEditDelegate::CodeTableEditDelegate(QWidget* parent, TableType tableType)
-    : QItemDelegate(parent), m_tableType(tableType), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QItemDelegate(parent), m_tableType(tableType), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    DEBUG_LOG(m_logger) << "CodeTableEditDelegate::ctor()";
 }
@@ -18,7 +18,7 @@ CSVExport::CSVExport(const NumeralCodeModel* numCodeModel, const AuthenticationC
                     const QString& note, QWidget* parent)
    : QWidget(parent), m_numCodeModel(numCodeModel), m_authenticationCodeModel(authenticationCodeModel),
      m_logisticalTermsModel(logisticalTermsModel), m_phraseTableModel(phraseTableModel), m_note(note),
-      m_logger(NGL::NGLLoggerBootstrap::getLogger())
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -20,7 +20,7 @@ CSVImport::CSVImport(NumeralCodeModel* numCodeModel, AuthenticationCodeModel* au
                     QWidget* parent)
    : QWidget(parent), m_numCodeModel(numCodeModel), m_authenticationCodeModel(authenticationCodeModel),
      m_logisticalTermsModel(logisticalTermsModel), m_phraseTableModel(phraseTableModel), m_note(note),
-      m_logger(NGL::NGLLoggerBootstrap::getLogger())
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -12,7 +12,7 @@ MainDialog::MainDialog(QWidget *parent) : QDialog(parent)
  , m_ui(new Ui::MainDialog)
  , m_numCodeModel(new NumeralCodeModel(parent))
  .getNGLLogger("COD_Test_NumeralCodeTableMainDialog")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    m_ui->setupUi(this);
 }
@@ -9,10 +9,9 @@
 namespace ComponentMonitor
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:cmo")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace EffectManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:efm.cevapcici")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT

@@ -19,7 +19,7 @@ namespace EffectManagement
 QIcon SoundAreaEditPlaylistDelegate::s_iconInf = QIcon(QStringLiteral("icon:infinity.svg"));

 SoundAreaEditPlaylistDelegate::SoundAreaEditPlaylistDelegate(QObject* parent)
-    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -65,7 +65,7 @@ void SpinBoxDelegate::updateEditorGeometry(QWidget* editor, const QStyleOptionVi
 }

 SoundTreeItem::SoundTreeItem(const QVector<QVariant>& data, const SoundKey& key, SoundTreeItem* parent)
-    : m_parent(parent), m_data(data), m_soundKey(key), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : m_parent(parent), m_data(data), m_soundKey(key), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -12,7 +12,7 @@ namespace EffectManagement
 {

 SoundAreaHelper::SoundAreaHelper(SoundAreaHelper* helper)
-    : m_ismDtc(helper->ismDtc()), m_somDtc(helper->somDtc()), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : m_ismDtc(helper->ismDtc()), m_somDtc(helper->somDtc()), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
    for (const auto& asset : std::as_const(assets))
@@ -13,7 +13,7 @@ namespace EffectManagement
 {

 SoundAreaSelectDelegate::SoundAreaSelectDelegate(QObject* parent)
-    : QItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -14,7 +14,7 @@ const QIcon SwitchItemDelegate::s_iconOn = QIcon(QStringLiteral("icon:switch_on.
 const QIcon SwitchItemDelegate::s_iconOff = QIcon(QStringLiteral("icon:switch_off.svg"));

 SwitchItemDelegate::SwitchItemDelegate(QObject* parent)
-    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -13,10 +13,9 @@
 namespace EffectShowClient
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:esc")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -9,10 +9,9 @@
 namespace EffectShowManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:esm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace Evaluations
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:evl")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -12,7 +12,7 @@ namespace Evaluations

 TopicEditorEvaluationModel::TopicEditorEvaluationModel(QObject* parent)
    : NGLTreeModel(parent, new NGLTreeItem(QVariant()), ,
-                   m_logger(NGL::NGLLoggerBootstrap::getLogger()){tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
+                   m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()){tr("Id"), tr("Name"), tr("Weight"), tr("Start Time"),
                                                                  tr("Situation"), tr("Video"), tr("Audio")})
 {
 }
@@ -11,7 +11,7 @@ namespace Evaluations
 {
 EvlNewCommentDialog::EvlNewCommentDialog(const std::shared_ptr<OperatorManagement::Interface::Dtc>& opmDtc,
                                         QWidget* parent)
-    : QDialog(parent), m_ui(new Ui::EvlNewCommentDialog), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QDialog(parent), m_ui(new Ui::EvlNewCommentDialog), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
    m_ui->setupUi(this);
    setWindowFlags(Qt::Tool);
@@ -10,10 +10,9 @@
 namespace ExerciseManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:exm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,6 +10,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS FlmDataPlugin MODULE flm_data_plugin.cpp flm_data_plugin.h)
+set_target_properties(FlmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(FlmDataPlugin
  Qt6::Core
  FlmDataPluginInterface
@@ -10,10 +10,9 @@
 namespace FileManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:flm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -6,7 +6,7 @@
 namespace FileManagement
 {
 FlmHQReportModel::FlmHQReportModel(QObject* parent)
-    : QAbstractListModel(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
+    : QAbstractListModel(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
 }

@@ -17,7 +17,7 @@ namespace FileManagement

 OfficeIntegration::OfficeIntegration(const FileManagement::FileContent &fileContent, QObject *parent) : QObject(parent)
  , m_selectedFileContent(fileContent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 OfficeIntegration::~OfficeIntegration()
 {
@@ -18,7 +18,7 @@ FileContentPreviewPlaybackWidget::FileContentPreviewPlaybackWidget(const std::sh
  , m_ui(new Ui::FileContentPreviewPlaybackWidget)
  , m_getContent(new FileManagement::GetFileContent(ftc, this))
  , m_closeTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_ui->setupUi(this);

  m_ui->lblPixmap->setVisible(false);
@@ -14,10 +14,9 @@ namespace FilterManagement



-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:flt")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace GuezIedManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:gim")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -12,10 +12,9 @@
 namespace GuezNasat
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:gna")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -15,6 +15,7 @@ NGL_ADD_LIBRARY(WS IsmDataPlugin MODULE
  ism_foreign_data_plugin.cpp
  ism_foreign_data_plugin.h
 )
+set_target_properties(IsmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(IsmDataPlugin
  IsmDataPluginInterface
  IsmShared
@@ -9,10 +9,9 @@
 namespace InfrastructureManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:ism")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -14,7 +14,7 @@ namespace InfrastructureManagement
 {

 SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) { tr("Name") })
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { tr("Name") })
 , m_dtc(nullptr)
 {
 }
@@ -250,7 +250,7 @@ TreeItem::TreeItem(int mseId, int sectionId, const QString &displayName, int exe
  , m_exerciseId(exerciseId)
  , m_originalExerciseId(exerciseId)
  , m_parentItem(parentItem),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {

 }

@@ -12,7 +12,7 @@ namespace InfrastructureManagement
 NewPlanDialog::NewPlanDialog(LtsSession::LtsSession *session, QWidget *parent) : QDialog(parent)
  , m_ui(new Ui::NewPlanDialog)
  , m_session(session),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  setWindowTitle(tr("Create New Plan"));
  m_ui->setupUi(this);

@@ -25,7 +25,7 @@ PlanChooser::PlanChooser(const std::shared_ptr<Interface::Dtc> &dtc, QWidget *pa
  , m_model(nullptr)
  , m_dtc(dtc)
  , m_selected(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(false);

  m_ui->setupUi(this);
@@ -9,6 +9,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS MrkDataPlugin MODULE mrk_data_plugin.cpp mrk_data_plugin.h)
+set_target_properties(MrkDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(MrkDataPlugin
  Qt6::Core
  Qt6::Widgets #QColor/QApplication for trackentry
@@ -9,10 +9,9 @@
 namespace MarkerManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:mrk")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -62,7 +62,7 @@ bool containsStream(QComboBox *cb, const QString &internalStreamName)
 namespace MarkerManagement
 {
 FinishedSignal::FinishedSignal() : QObject(),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}


 SetMarkers::SetMarkers(LtsSession::LtsSession *session, QWidget *parent)
@@ -13,10 +13,9 @@
 namespace Messaging
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:msg")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -13,10 +13,9 @@
 namespace MeteoDataManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:mdm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace NotificationManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:nom")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,6 +10,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS ObdDataPlugin MODULE obd_data_plugin.cpp obd_data_plugin.h)
+set_target_properties(ObdDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(ObdDataPlugin
  Qt6::Core
  ObdDataPluginInterface
@@ -10,10 +10,9 @@
 namespace OcBaseDownload
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:obd")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace OcSituationClient
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:osc")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -101,7 +101,7 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage

 DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
  .getNGLLogger("OnlineReportDetailedChartModel")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_participantStates.insert(ProjectDataManagement::VulnerabilityState::CombatReady, QSet<int32_t>());
  m_participantStates.insert(ProjectDataManagement::VulnerabilityState::LightDamage, QSet<int32_t>());
  m_participantStates.insert(ProjectDataManagement::VulnerabilityState::MediumDamage, QSet<int32_t>());
@@ -74,7 +74,7 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme

 SimpleChartModel::SimpleChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent)
  .getNGLLogger("OnlineReportSimpleChartModel")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  auto cb = [this](const ParticipantManagement::DynamicParticipantData & data)
  {
    if (!m_config.participantIds.contains(data.participantId()))
@@ -9,6 +9,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS OpmDataPlugin MODULE opm_data_plugin.cpp opm_data_plugin.h)
+set_target_properties(OpmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(OpmDataPlugin
  Qt6::Core
  OpmDataPluginInterface
@@ -11,10 +11,9 @@ class QTimer;
 namespace OperatorManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:opm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -9,6 +9,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS PpmDataPlugin MODULE ppm_data_plugin.cpp ppm_data_plugin.h)
+set_target_properties(PpmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(PpmDataPlugin
  Qt6::Core
  PpmDataPluginInterface
@@ -9,10 +9,9 @@
 namespace ParticipantManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:ppm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -34,7 +34,7 @@ ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportServi
  , m_ppmGuiCbxIfc(nullptr)
  , m_session(session)
  , m_ui(new Ui::ParticipantEditItemWidgetBase),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_ui->setupUi(this);
  setWindowTitle(tr("Edit Participant"));
  connect(m_ui->pbIcon, &QToolButton::clicked, this, &ParticipantEditItemWidgetBase::onSymbolSelection);
@@ -422,7 +422,7 @@ void ParticipantOrganisationDialog::showContextMenu(const QPoint &position)


 DeleteDelegate::DeleteDelegate(QObject *parent) : QItemDelegate(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 void DeleteDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
@@ -12,7 +12,7 @@ namespace ParticipantManagement
 {

 ParticipantInfoLtdGearComponent::ParticipantInfoLtdGearComponent(QTableWidget *tableWidget) : m_tableWidget(tableWidget),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  if (!m_tableWidget)
    ERROR_LOG(m_logger) << "Got invalid table widget.";
 }
@@ -661,7 +661,7 @@ void ParticipantTargetConfigurationDialog::showPreviewObject()


 EditNameDelegate::EditNameDelegate(QWidget *parent) : QItemDelegate(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -302,7 +302,7 @@ WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
  , m_currentJsonString(QString())
  , m_updateString(QString())
  , m_updateTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
 }

@@ -24,7 +24,7 @@ SelectionWorker::SelectionWorker(PlanEditor                   *planEditor
  , m_geometryModel(geometryModel)
  , m_map(map)
  , m_rubberband(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {

  switch (mode)
  {
@@ -10,6 +10,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS PreDataPlugin MODULE pre_data_plugin.cpp pre_data_plugin.h)
+set_target_properties(PreDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(PreDataPlugin
  Qt6::Core
  PreDataPluginInterface
@@ -11,10 +11,9 @@

 namespace PresentationManagement
 {
-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:pre")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -33,7 +33,7 @@ TopicRecorder::TopicRecorder(const int topicId, const QString &topicName, const
  , m_topicName(topicName)
  , m_topicId(topicId)
  , m_length((m_stopTime - (m_startTime - offset)) / 1000),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  const auto screenGlobalPos = screen->mapToGlobal({0,0});
  const auto screenGeo = screen->geometry();

@@ -25,7 +25,7 @@ TopicShotter::TopicShotter(const int topicId, const QString &topicName, const Sc
  , m_topicH(topicH)
  , m_desc(desc)
  , m_isFilterTopic(isFilterTopic),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}


 TopicShotter::~TopicShotter()
@@ -9,10 +9,9 @@
 namespace ProjectDataManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:pdm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -10,10 +10,9 @@
 namespace ReportManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:rep")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -18,7 +18,7 @@ using namespace ReportManagement;

 MaintenanceModel::MaintenanceModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
  , m_ppmDtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  if (!fetchInterfaces())
    return;

@@ -23,7 +23,7 @@ using namespace ReportManagement;
 TreatmentModel::TreatmentModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
  , m_ppmDtc(nullptr)
  , m_pdmDtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  if (!fetchInterfaces())
    return;

@@ -21,7 +21,7 @@ using namespace ReportManagement;
 TreatmentTimelineModel::TreatmentTimelineModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
  , m_ppmDtc(nullptr)
  , m_pdmDtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  if (!fetchInterfaces())
    return;

@@ -17,7 +17,7 @@ using namespace ReportManagement;

 UnitPowerModel::UnitPowerModel(const ReportInfo &report, LtsSession::LtsSession *session, QObject *parent) : AbstractModel(report, session, parent)
  , m_ppmDtc(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  if (!fetchInterfaces())
    return;

@@ -12,10 +12,9 @@
 namespace SAAInterfaceAdapterAdler
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:saa")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -9,6 +9,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS ScmDataPlugin MODULE scm_data_plugin.cpp scm_data_plugin.h)
+set_target_properties(ScmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(ScmDataPlugin
  Qt6::Core
  ScmDataPluginInterface
@@ -9,10 +9,9 @@
 namespace ServiceManagement
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:scm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -1304,7 +1304,7 @@ EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, con
  , mainStructureElement(mse)
  , relayState(rs)
  , mountingPointAsset(mpa),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  for (int relayId : relayIds)
    effectOverrides.insert(relayId, InfrastructureManagement::EffectOverride_def::Automatic);

@@ -84,7 +84,7 @@ namespace SituationMap
 {

 AdapterDds::AdapterDds(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START DDDDDDDD" ;
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
 }
@@ -137,7 +137,7 @@ public:

 BuildingContamination::BuildingContamination(int drawOrder, QObject *parent) : BaseClass(parent)
  , d(new Private()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  d->m_drawOrder = drawOrder;
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -213,7 +213,7 @@ public:

 BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent) : BaseClass(parent)
  , d(new Private()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  d->m_drawOrder = drawOrder;
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -26,7 +26,7 @@ QString toString(SpecialChargeType value)
 }

 PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm) : m_dtcPdm(dtcPdm),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}


 void PdmHandler::initializePdm()
@@ -88,7 +88,7 @@ void ConfigureSingleMapUrl::onClose()

 ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent) : QWidget(parent)
  , m_ui(new Ui::Configure_Urls_Widget),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  m_ui->setupUi(this);

@@ -308,7 +308,7 @@ void MapObjectSelectionLtsDialog::onServiceMonitorRequestedAdd()

 MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent) : BaseClass(parent)
  , m_ui(new Ui::MapObjectSelectionDialog),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  m_ui->setupUi(this);
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -16,7 +16,7 @@ namespace SituationMap

 LayersModel::LayersModel(LtsSession::LtsSession *session, QObject *parent) : QAbstractTableModel(parent)
  , m_session(session),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool LayersModel::initModel(Map *situationMap)
 {
@@ -19,7 +19,7 @@ static inline bool isScreenIdValid(const OperatorManagement::ActiveApp &item)

 RegisterAppHandler::RegisterAppHandler() : BaseClass()
  , m_updateTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  INFO_LOG(m_logger) << "RAH c_tor";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";

@@ -11,7 +11,7 @@
 namespace SituationMap
 {
 TerrainProfileHandler::TerrainProfileHandler(const QString &menuGroup) : m_menuGroup(menuGroup),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 TerrainProfileHandler::~TerrainProfileHandler()
 {
@@ -8,10 +8,9 @@
 namespace SituationReplay
 {

-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:srp")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -9,6 +9,7 @@
 # Data Plugin
 #
 NGL_ADD_LIBRARY(WS SrmDataPlugin MODULE srm_data_plugin.cpp srm_data_plugin.h)
+set_target_properties(SrmDataPlugin PROPERTIES AUTOMOC ON)
 NGL_TARGET_LINK_LIBRARIES(SrmDataPlugin
  Qt6::Core
  Qt6::Network
@@ -14,10 +14,9 @@ class QProcess;
 namespace SituationReplayManagement
 {
 class ReplayHandler;
-class DataPlugin final : public QObject, public DataPluginBase::Plugin
+class DataPlugin final : public DataPluginBase::Plugin
 {
  Q_PLUGIN_METADATA(IID "data:3:srm")
-  Q_INTERFACES(DataPluginBase::Plugin)

  Q_OBJECT
 public:
@@ -49,7 +49,7 @@ HttpProcess::HttpProcess(ExportedScriptInformation &&esi, QObject *parent) : QOb
  , m_process(new ProcessOverlay)
  , m_nam(new QNetworkAccessManager(this))
  , m_timeout(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_process, &ProcessOverlay::signalCancel,
          this, [this]()
  {