Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung
- 44 Export-Header Include-Pfade korrigiert (_export.h)
- 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h)
- INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros
- Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits)
- FATAL_LOG Makro hinzugefügt
- InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h)
- FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h)
- AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp)
- SymbolAppearance Klasse vollständig definiert mit content() Methode
- BuildingComponentFilter Klasse definiert mit Copy-Konstruktor
- Ftc Factory: nullptr Return (abstract class)
- AesFilter Klasse in aes.hpp hinzugefügt
- Dtc Klasse in ppm.hpp mit participantChanged Signal
- AesType Enum: alle 15 At* Werte definiert
- AesEffectState_def: EsReceived hinzugefügt
- DataModification Enum: eAdded/eModified/eRemoved
- function_reply_object.h → core_types.h Include-Pfad (72 Dateien)
- Enum-Class-Streaming Template-Operator in INGLLogger.h
- ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen
- ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge
- QRegExp → QRegularExpression in tpm_js_parser.cpp
- .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert
- Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h

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

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_journal_dialog.h

@@ -37,8 +37,6 @@ private:
   MainJournal *m_journal { nullptr };
 
   Ui::JournalDialog *m_ui { nullptr };
-  NGL::INGLLogger &m_logger;
-
 };
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.cpp

@@ -17,7 +17,7 @@ ScreenRecorder::ScreenRecorder(QObject *parent)
   : QObject(parent)
   , m_logger(getLogger(QStringLiteral("ScreenRecorder")))
 {
-  connect(this, &ScreenRecorder::newTime, this, [this](qint64 _t1){ DEBUG_LOG(m_logger) << "newTime: " << _t1; });
+  connect(this, &ScreenRecorder::newTime, this, [this](qint64 _t1){ DEBUG_LOG() << "newTime: " << _t1; });
 }
 
 
@@ -34,7 +34,7 @@ void ScreenRecorder::cut()
     }
     catch (const QString &msg)
     {
-      ERROR_LOG(m_logger) << "Cutting recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
+      ERROR_LOG() << "Cutting recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
       m_failedExportTopicIds += tr->topicId();
     }
   }
@@ -54,7 +54,7 @@ void ScreenRecorder::save(const QString &tmpDirPath)
     }
     catch (const QString &msg)
     {
-      ERROR_LOG(m_logger) << "Saving recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
+      ERROR_LOG() << "Saving recording of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
       m_failedExportTopicIds += tr->topicId();
     }
   }
@@ -81,14 +81,14 @@ void ScreenRecorder::addTopicsForScreen(Screen *screen, const std::vector<TopicI
     connect(topicRecorder, &TopicRecorder::exportFailed, this, [this, id]() { emit topicExportFailed(id); });
     connect(topicRecorder, &TopicRecorder::exportFailed, this, [this, name, id]()
     {
-      ERROR_LOG(m_logger) << "Export failed for topic '" << name << "', id: " << id;
+      ERROR_LOG() << "Export failed for topic '" << name << "', id: " << id;
       m_failedExportTopicIds += id;
     });
 
     m_topicRecorder.append(topicRecorder);
   }
 
-  DEBUG_LOG(m_logger) << "Added " << topicItems.size() << " TopicRecorder.";
+  DEBUG_LOG() << "Added " << topicItems.size() << " TopicRecorder.";
 }
 
 
@@ -117,7 +117,7 @@ void ScreenRecorder::setCurrentTime(qint64 currentTime)
 
 void ScreenRecorder::clear()
 {
-  DEBUG_LOG(m_logger) << "Clearing TopicRecorder.";
+  DEBUG_LOG() << "Clearing TopicRecorder.";
 
   for (TopicRecorder *currentTopicRecorder : std::as_const(m_topicRecorder))
   {
@@ -130,12 +130,12 @@ void ScreenRecorder::clear()
 
 void ScreenRecorder::waitForFinishedRecording()
 {
-  DEBUG_LOG(m_logger) << "Waiting for TopicRecorder to finish ...";
+  DEBUG_LOG() << "Waiting for TopicRecorder to finish ...";
 
   for (TopicRecorder *currentTopicRecorder : std::as_const(m_topicRecorder))
     currentTopicRecorder->waitForFinishedRecording();
 
-  DEBUG_LOG(m_logger) << "... all TopicRecorder finished.";
+  DEBUG_LOG() << "... all TopicRecorder finished.";
 }
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_recorder.h

@@ -51,7 +51,6 @@ signals:
 private: 
   QVector<TopicRecorder *> m_topicRecorder;
   QSet<int> m_failedExportTopicIds;
-  LOGGER_T m_logger;
 }; 
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.cpp

@@ -33,7 +33,7 @@ void ScreenShotter::addTopicsForScreen(Screen *screen, const std::vector<TopicIt
     const double topicY = currentTopicItem.topicData().y;
     const double topicW = currentTopicItem.topicData().w;
     const double topicH = currentTopicItem.topicData().h;
-    ERROR_LOG(m_logger) << "ScreenShotter::addTopicsForScreen: x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
+    ERROR_LOG() << "ScreenShotter::addTopicsForScreen: x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
     TopicShotter *topicShotter = new TopicShotter(id, name, screen, 0, startTime, stopTime, topicX, topicY,
                                                   topicW, topicH, (!currentTopicItem.parentChannel().isEmpty()),
                                                   currentTopicItem.description(), this);
@@ -42,14 +42,14 @@ void ScreenShotter::addTopicsForScreen(Screen *screen, const std::vector<TopicIt
     connect(topicShotter, &TopicShotter::exportFailed, this, [this, id]() { emit topicExportFailed(id); });
     connect(topicShotter, &TopicShotter::exportFailed, this, [this, name, id]()
     {
-      ERROR_LOG(m_logger) << "Export failed for topic '" << name << "', id: " << id;
+      ERROR_LOG() << "Export failed for topic '" << name << "', id: " << id;
       m_failedExportTopicIds += id;
     });
 
     m_topicShotter.append(topicShotter);
   }
 
-  DEBUG_LOG(m_logger) << "Added " << topicItems.size() << " TopicShotter.";
+  DEBUG_LOG() << "Added " << topicItems.size() << " TopicShotter.";
 }
 
 void ScreenShotter::saveRecordings(const QString &tmpDirPath)
@@ -65,7 +65,7 @@ void ScreenShotter::saveRecordings(const QString &tmpDirPath)
     }
     catch (const QString &msg)
     {
-      ERROR_LOG(m_logger) << "Saving screenshot of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
+      ERROR_LOG() << "Saving screenshot of topic '" << tr->topicName() << "', id: " << tr->topicId() << " failed! " << msg;
       m_failedExportTopicIds += tr->topicId();
     }
   }

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_screen_shotter.h

@@ -38,7 +38,6 @@ signals:
 private: 
   QVector<TopicShotter *> m_topicShotter;
   QSet<int> m_failedExportTopicIds;
-  LOGGER_T m_logger;
 }; 
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h

@@ -218,7 +218,7 @@ private:
 
     if (!m_exerciseSession->interfaceFromGui<TopicEditorInterface>(topicEditorIfc))
     {
-      ERROR_LOG(m_logger) << "getTopicEditorIfc failed: Cannot add topic type "
+      ERROR_LOG() << "getTopicEditorIfc failed: Cannot add topic type "
                           << TopicEditorBase::topicTypeString(topicType)
                           << " because topic editor ifc is missing.";
       return nullptr;
@@ -234,7 +234,7 @@ private:
 
     if (!m_replaySession->interfaceFromGui<TopicReplayInterface>(topicReplayFactory))
     {
-      ERROR_LOG(m_logger) << "getTopicIfcFactory failed: Cannot add topic type "
+      ERROR_LOG() << "getTopicIfcFactory failed: Cannot add topic type "
                           << TopicEditorBase::topicTypeString(topicType)
                           << " because topic ifc factory is missing.";
       return nullptr;
@@ -431,7 +431,6 @@ private:
 
   Ui::ScriptDialog *m_ui { nullptr };
   bool m_lastScriptHasEnded { false };
-  NGL::INGLLogger &m_logger;
   QMap<TopicEditorBase::TopicType, int> m_avaibleTopics{};  
   QVector<TopicEditorBase::TopicType> m_modifiedTopicTypesList;
 
@@ -457,7 +456,6 @@ private:
   ScriptTimelineDialog &m_this;
   std::unique_ptr<LtsWidgets::LtsOverlayLoading> m_loading;
   bool m_stoppedPrematurely { false };
-  NGL::INGLLogger &m_logger;
 };
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.cpp

@@ -164,8 +164,8 @@ int ScriptModel::addItem(const QString &trackName, TopicItem &&_topicItem, qint6
         return lambda(m_screen2TrackId, std::move(_topicItem));
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed for item with trackName = " << trackName << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with trackName = " << trackName << " failed"; }
   return -1;
 }
 
@@ -216,8 +216,8 @@ std::vector<TopicItem> ScriptModel::topicItems() const
           for (const ItemPtr &_itemPtr: _trackPtr->items())
             ret.push_back(static_cast<const TopicItem &>(*_itemPtr.get()).copy());
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -243,11 +243,11 @@ std::vector<TopicItem> ScriptModel::topicItemsByTrackId(int trackId) const
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg;
+    ERROR_LOG() << Q_FUNC_INFO << " " << errMsg;
   }
   catch (...)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+    ERROR_LOG() << Q_FUNC_INFO << " failed";
   }
 
   return ret;
@@ -279,8 +279,8 @@ QVector<int> ScriptModel::mainTopicItemIds() const
       for (const ItemPtr &_itemPtr: _screen2Track.items())
         ret.append(_itemPtr->id());
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -344,8 +344,8 @@ QVector<int> ScriptModel::filterTopicItemIds() const
           for (const ItemPtr &_itemPtr: _trackPtr->items())
             ret.append(_itemPtr->id());
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -363,8 +363,8 @@ QVector<int> ScriptModel::filterTopicItemIds(int _topicItemId) const
       if (_trackPtr->isItemsBetween(_topicItem.startTime(), end, {}))
         ret += _trackPtr->itemIdsBetween(_topicItem.startTime(), end, false, true);
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return ret;
 }
 
@@ -402,8 +402,8 @@ qint64 ScriptModel::firstTopicStart() const
         firstStart = std::min(firstStart, time);
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return firstStart == LLONG_MAX ? -1 : firstStart;
 }
 
@@ -428,8 +428,8 @@ qint64 ScriptModel::lastTopicEnd() const
     if (time != -1)
       lastEnd = std::max(lastEnd, time);
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return lastEnd;
 }
 
@@ -460,7 +460,7 @@ bool ScriptModel::isMainTrack(int _trackId) const
   {
     return track(_trackId).parentId() == m_rootTrack.id();
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
   catch (...) {}
   return false;
 }
@@ -476,7 +476,7 @@ bool ScriptModel::isFilterTrack(int _trackId) const
   {
     return track(_trackId).parentId() != m_rootTrack.id(); 
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
   catch (...) {}
   return false;
 }
@@ -676,12 +676,12 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
     }
     catch (const QString &errMsg)
     {
-      ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg;
+      ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg;
       return false;
     }
     catch (...)
     {
-      ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+      ERROR_LOG() << Q_FUNC_INFO << " failed";
       return false;
     }
   }
@@ -706,12 +706,12 @@ bool ScriptModel::import(const QVector<PresentationContent> &contents) noexcept(
   }
   catch (const QString &errMsg)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " failed: " << errMsg;
+    ERROR_LOG() << Q_FUNC_INFO << " failed: " << errMsg;
     return false;
   }
   catch (...)
   {
-    ERROR_LOG(m_logger) << LOGFUNCTION << " failed";
+    ERROR_LOG() << Q_FUNC_INFO << " failed";
     return false;
   }
 
@@ -763,8 +763,8 @@ void ScriptModel::insertTopicItem(int _trackId, TopicItem &&__topicItem)
     if (isFilterTrack(_topicTrack.id()))
       _topicItem.setParentChannel(static_cast<const TopicTrack &>(track(_topicTrack.parentId())).internalName());
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
 }
 
 
@@ -926,8 +926,8 @@ bool ScriptModel::canDropItem(const Item &_item, int _trackId, qint64 start) con
 
     return !isTopicItemBlocked(_topicItem, static_cast<const TopicTrack &>(track(_trackId)), start, _topicItem.duration());
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed: "  << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " failed: "  << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
   return false;
 }
 
@@ -980,8 +980,8 @@ bool ScriptModel::canMoveItem(const Item &_item, qint64 start) const
       static_cast<const TopicItem &>(_item), static_cast<const TopicTrack &>(track(_item.parentTrackId())), start, _item.duration()
     );
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed for item with id = " << _item.id(); }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << _item.id(); }
   return false;
 }
 
@@ -1050,8 +1050,8 @@ bool ScriptModel::canResizeItem(const Item &_item, qint64 start, int duration) c
       static_cast<const TopicItem &>(_item), static_cast<const TopicTrack &>(track(_item.parentTrackId())), start, duration
     );
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed for item with id = " << _item.id(); }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for item with id = " << _item.id(); }
   return false;
 }
 
@@ -1068,7 +1068,7 @@ void ScriptModel::copyToClipboard(const QVector<int> &_itemIds) noexcept(false)
     _topicItemPtr->m_parentTrackId = _topicItem.m_parentTrackId;
     minTime = std::min(minTime, _topicItem.startTime());
     m_clipboard.push_back(std::move(_topicItemPtr));
-    DEBUG_LOG(m_logger) << LOGFUNCTION << " copied item with id = " << _topicItem.id() << " to clipboard";
+    DEBUG_LOG() << Q_FUNC_INFO << " copied item with id = " << _topicItem.id() << " to clipboard";
   };
 
   for (int _topicItemId : _itemIds)
@@ -1181,8 +1181,8 @@ void ScriptModel::pasteFromClipboard(qint64 time) noexcept(false)
       _topicItem.setTopicId(_itemId);
       _topicItem.topicData().startTime = _topicItem.startTime() / 1000LL;
     }
-    catch (const QString &errMsg) { ERROR_LOG(m_logger) << "adding item failed: " << errMsg; }
-    catch (...) { ERROR_LOG(m_logger) << "adding item failed"; }
+    catch (const QString &errMsg) { ERROR_LOG() << "adding item failed: " << errMsg; }
+    catch (...) { ERROR_LOG() << "adding item failed"; }
   }
   m_clipboard.clear();
 
@@ -1214,12 +1214,12 @@ ScriptModel::PasteTestResult ScriptModel::canPasteFromClipboard(qint64 time) con
     }
     catch (const QString &errMsg)
     {
-      ERROR_LOG(m_logger) << "checking for collision failed: " << errMsg;
+      ERROR_LOG() << "checking for collision failed: " << errMsg;
       return PasteTestResult::No;
     }
     catch (...)
     {
-      ERROR_LOG(m_logger) << "checking for collision failed";
+      ERROR_LOG() << "checking for collision failed";
       return PasteTestResult::No;
     }
   }
@@ -1386,7 +1386,7 @@ bool ScriptModel::canDropTopicType(TopicType _topicType, int _trackId) const
     }
     return true;
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << errMsg; }
+  catch (const QString &errMsg) { ERROR_LOG() << errMsg; }
   catch (...) {}
   return false;
 }
@@ -1469,8 +1469,8 @@ bool ScriptModel::isTopicItemBlocked(const TopicItem &_topicItem, const TopicTra
       return false;
     }
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed for itemId = " << _topicItem.id() << " and trackId = " << _topicTrack.id(); }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for itemId = " << _topicItem.id() << " and trackId = " << _topicTrack.id(); }
   return false;
 }
 
@@ -1500,8 +1500,8 @@ void ScriptModel::getActualFilterTopicRange(int parentTrackId, TopicItem &_topic
     if (_topicItem.startTime() + _topicItem.duration() > _mainTopicAtItemEnd.startTime() + _mainTopicAtItemEnd.duration())
       _topicItem.setDuration(_mainTopicAtItemEnd.startTime() + _mainTopicAtItemEnd.duration() - _topicItem.startTime());
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed for parentTrackId = " << parentTrackId; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed for parentTrackId = " << parentTrackId; }
 }
 
 
@@ -1524,8 +1524,8 @@ void ScriptModel::onInsertTrack(const QModelIndex &idx)
     emit dataChanged(idx, idx); 
     m_dialog->timeline()->view()->expand(idx);
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << "Adding child track to track with id = " << idx.internalId() << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << errMsg; }
+  catch (...) { ERROR_LOG() << "Adding child track to track with id = " << idx.internalId() << " failed"; }
 }
 
 void ScriptModel::onRemoveTrack(const QModelIndex &idx)
@@ -1554,8 +1554,8 @@ void ScriptModel::onRemoveTrack(const QModelIndex &idx)
     }
     emit dataChanged(parentIndex, parentIndex);
   }
-  catch (const QString &errMsg) { ERROR_LOG(m_logger) << LOGFUNCTION << " " << errMsg; }
-  catch (...) { ERROR_LOG(m_logger) << LOGFUNCTION << " failed"; }
+  catch (const QString &errMsg) { ERROR_LOG() << Q_FUNC_INFO << " " << errMsg; }
+  catch (...) { ERROR_LOG() << Q_FUNC_INFO << " failed"; }
 }
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_model.h

@@ -138,9 +138,6 @@ private:
   int m_replayTrackId{-1};
   int m_screen1TrackId{-1};
   int m_screen2TrackId{-1};
-
-  NGL::INGLLogger &m_logger;
-
 };
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_storyboard.h

@@ -53,8 +53,6 @@ private:
   bool m_isAlreadyTranslated { false };
 
   Ui::StoryboardDialog *m_ui { nullptr };
-  NGL::INGLLogger &m_logger;
-
 };
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.cpp

@@ -34,7 +34,6 @@ 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(getLogger("TopicRecorder"))
 {
   const auto screenGlobalPos = screen->mapToGlobal({0,0});
   const auto screenGeo = screen->geometry();
@@ -54,20 +53,20 @@ TopicRecorder::TopicRecorder(const int topicId, const QString &topicName, const
   const qint32 inputW = (qint32)(fullscreen ? screenW : screenW * topicW);
   const qint32 inputH = (qint32)(fullscreen ? screenH : screenH * topicH);
 
-  ERROR_LOG(m_logger) << "TopicRecorder: fullscreen? " << fullscreen;
-  ERROR_LOG(m_logger) << "TopicRecorder: topic  - x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
-  ERROR_LOG(m_logger) << "TopicRecorder: screen - x: " << screenX << ", y: " << screenY << ", w: " << screenW << ", h: " << screenH;
-  ERROR_LOG(m_logger) << "TopicRecorder: input  - x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH;
+  ERROR_LOG() << "TopicRecorder: fullscreen? " << fullscreen;
+  ERROR_LOG() << "TopicRecorder: topic  - x: " << topicX << ", y: " << topicY << ", w: " << topicW << ", h: " << topicH;
+  ERROR_LOG() << "TopicRecorder: screen - x: " << screenX << ", y: " << screenY << ", w: " << screenW << ", h: " << screenH;
+  ERROR_LOG() << "TopicRecorder: input  - x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH;
 
   if (!m_tmpRecordingFile.open()) 
     throw std::runtime_error(L("Failed to open temporary recording file: %1").arg(m_tmpRecordingFile.errorString()).toStdString());
 
   m_recordingProcess->setProgram(s_program);
   m_recordingProcess->setArguments(L("-hide_banner -f x11grab -s %1x%2 -i :0.0+%3,%4 -c:v libx264 -y -map 0 -movflags +faststart -f %5 %6").arg(inputW).arg(inputH).arg(inputX).arg(inputY).arg(s_container).arg(m_tmpRecordingFile.fileName()).split(L(" ")));
-  ERROR_LOG(m_logger) << "args: " << m_recordingProcess->arguments().join(L(" "));
-  connect(m_recordingProcess, &QProcess::readyReadStandardOutput, [this]() { ERROR_LOG(m_logger) << "REC [ ]: " << QString::fromUtf8(m_recordingProcess->readAllStandardOutput()); });
-  connect(m_recordingProcess, &QProcess::readyReadStandardError, [this]() { ERROR_LOG(m_logger) << "REC [!]: " << QString::fromUtf8(m_recordingProcess->readAllStandardError()); });
-  connect(m_recordingProcess, &QProcess::started, [this]() { ERROR_LOG(m_logger) << "REC started successfully!"; });
+  ERROR_LOG() << "args: " << m_recordingProcess->arguments().join(L(" "));
+  connect(m_recordingProcess, &QProcess::readyReadStandardOutput, [this]() { ERROR_LOG() << "REC [ ]: " << QString::fromUtf8(m_recordingProcess->readAllStandardOutput()); });
+  connect(m_recordingProcess, &QProcess::readyReadStandardError, [this]() { ERROR_LOG() << "REC [!]: " << QString::fromUtf8(m_recordingProcess->readAllStandardError()); });
+  connect(m_recordingProcess, &QProcess::started, [this]() { ERROR_LOG() << "REC started successfully!"; });
 
   if (!m_tmpCuttingFile.open()) 
     throw std::runtime_error(L("Failed to open temporary cutting file: %1").arg(m_tmpCuttingFile.errorString()).toStdString());
@@ -97,11 +96,11 @@ void TopicRecorder::cut()
   cuttingProcess->setProgram(s_program);
   
   cuttingProcess->setArguments(L("-hide_banner -y -sseof -%1 -i %2 -c:v libx264 -f %3 %4").arg(m_length).arg(m_tmpRecordingFile.fileName(), s_container, m_tmpCuttingFile.fileName()).split(L(" ")));
-  connect(cuttingProcess, &QProcess::readyReadStandardOutput, this, [this, cuttingProcess]() { ERROR_LOG(m_logger) << "CUT [ ]: " << QString::fromUtf8(cuttingProcess->readAllStandardOutput()); });
-  connect(cuttingProcess, &QProcess::readyReadStandardError, this, [this, cuttingProcess]() { ERROR_LOG(m_logger) << "CUT [!]: " << QString::fromUtf8(cuttingProcess->readAllStandardError()); });
-  connect(cuttingProcess, &QProcess::started, this, [this]() { ERROR_LOG(m_logger) << "CUT started successfully!"; });
+  connect(cuttingProcess, &QProcess::readyReadStandardOutput, this, [this, cuttingProcess]() { ERROR_LOG() << "CUT [ ]: " << QString::fromUtf8(cuttingProcess->readAllStandardOutput()); });
+  connect(cuttingProcess, &QProcess::readyReadStandardError, this, [this, cuttingProcess]() { ERROR_LOG() << "CUT [!]: " << QString::fromUtf8(cuttingProcess->readAllStandardError()); });
+  connect(cuttingProcess, &QProcess::started, this, [this]() { ERROR_LOG() << "CUT started successfully!"; });
 
-  ERROR_LOG(m_logger) << "start cut";
+  ERROR_LOG() << "start cut";
 
   cuttingProcess->start();
 
@@ -120,7 +119,7 @@ void TopicRecorder::cut()
   }
   catch (...)
   {
-    ERROR_LOG(m_logger) << "cut failed (error) with exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
+    ERROR_LOG() << "cut failed (error) with exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
     m_failed = true;
     cuttingProcess->deleteLater();
     return;
@@ -128,14 +127,14 @@ void TopicRecorder::cut()
 
   if (cuttingProcess->exitCode() != 0)
   {
-    ERROR_LOG(m_logger) << "cut failed with non-zero exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
+    ERROR_LOG() << "cut failed with non-zero exitCode=" << cuttingProcess->exitCode() << " and exitStatus=" << (cuttingProcess->exitStatus() == QProcess::ExitStatus::CrashExit ? "Crash" : "Normal Exit");
     m_failed = true;
     cuttingProcess->deleteLater();
     return;
   }
 
 
-  ERROR_LOG(m_logger) << "cut done";
+  ERROR_LOG() << "cut done";
   cuttingProcess->deleteLater();
 }
 
@@ -174,7 +173,7 @@ void TopicRecorder::onExportFailed(const QProcess::ProcessError error)
 
 void TopicRecorder::onExportFailed(const QString &errorMessage)
 {
-  ERROR_LOG(m_logger) << "Export failed for topic '" << m_topicName << "': " << errorMessage;
+  ERROR_LOG() << "Export failed for topic '" << m_topicName << "': " << errorMessage;
   emit exportFailed(errorMessage);
 }
 
@@ -215,16 +214,16 @@ void TopicRecorder::waitForFinishedRecording()
   }
   catch (...)
   {
-    ERROR_LOG(m_logger) << "waitForFinishedRecording: catch!";
+    ERROR_LOG() << "waitForFinishedRecording: catch!";
   }
 
-  ERROR_LOG(m_logger) << "waitForFinishedRecording: done waiting!";
+  ERROR_LOG() << "waitForFinishedRecording: done waiting!";
 }
 
 
 void TopicRecorder::onNewTime(qint64 time)
 {
-  ERROR_LOG(m_logger) << "onNewTime: " << time << ", startTime: " << m_startTime;
+  ERROR_LOG() << "onNewTime: " << time << ", startTime: " << m_startTime;
 
   switch (m_recordingState)
   {
@@ -232,9 +231,9 @@ void TopicRecorder::onNewTime(qint64 time)
     if (time < m_startTime)
       return;
 
-    ERROR_LOG(m_logger) << "onNewTime: started at " << time << " while startTime is " << m_startTime;
+    ERROR_LOG() << "onNewTime: started at " << time << " while startTime is " << m_startTime;
 
-    ERROR_LOG(m_logger) << "Starting \"" << processToString(m_recordingProcess) << "\"";
+    ERROR_LOG() << "Starting \"" << processToString(m_recordingProcess) << "\"";
 
     m_recordingProcess->start();
 
@@ -245,7 +244,7 @@ void TopicRecorder::onNewTime(qint64 time)
     if (time < m_stopTime)
       return;
 
-    ERROR_LOG(m_logger) << "Stopping recording for " << m_topicName;
+    ERROR_LOG() << "Stopping recording for " << m_topicName;
 
     m_recordingProcess->terminate();
 
@@ -262,7 +261,7 @@ void TopicRecorder::onNewTime(qint64 time)
 void TopicRecorder::onRecordingProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
   m_recordingState = RecordingState::Done;
-  ERROR_LOG(m_logger) << "Recording finished for " << m_topicName << ", with exitCode=" << exitCode << " and exitStatus=" << exitStatus;
+  ERROR_LOG() << "Recording finished for " << m_topicName << ", with exitCode=" << exitCode << " and exitStatus=" << exitStatus;
 
 
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_recorder.h

@@ -80,8 +80,6 @@ private:
   const int m_topicId;
   bool m_failed { false };
   qint32 m_length;
-
-  LOGGER_T m_logger;
 }; 
 
 } 

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.cpp

@@ -26,7 +26,6 @@ TopicShotter::TopicShotter(const int topicId, const QString &topicName, const Sc
   , m_topicH(topicH)
   , m_desc(desc)
   , m_isFilterTopic(isFilterTopic)
-  , m_logger(getLogger("TopicShotter"))
 {}
 
 
@@ -49,7 +48,7 @@ void TopicShotter::saveRecording(const QString &saveToPath)
 
 void TopicShotter::onExportFailed(const QString &errorMessage)
 {
-  ERROR_LOG(m_logger) << "Export failed for topic '" << m_topicName << "': " << errorMessage;
+  ERROR_LOG() << "Export failed for topic '" << m_topicName << "': " << errorMessage;
   emit exportFailed(errorMessage);
 }
 
@@ -60,7 +59,7 @@ void TopicShotter::onNewTime(qint64 time)
   const qint64 filterTopicDelay = (m_isFilterTopic ? 1000 : 0);
   const qint64 startTime = m_startTime + filterTopicDelay + 1000 ;
 
-  DEBUG_LOG(m_logger) << "onNewTime: " << time << ", startTime: " << startTime << ", isFilterTopic? " << m_isFilterTopic << ", desc: " << m_desc;
+  DEBUG_LOG() << "onNewTime: " << time << ", startTime: " << startTime << ", isFilterTopic? " << m_isFilterTopic << ", desc: " << m_desc;
 
   if (time < startTime)
     return;
@@ -69,7 +68,7 @@ void TopicShotter::onNewTime(qint64 time)
     return;
   isStarted = true;
 
-  DEBUG_LOG(m_logger) << "onNewTime: started at " << time << " while startTime is " << startTime;
+  DEBUG_LOG() << "onNewTime: started at " << time << " while startTime is " << startTime;
 
   if (!m_tmpFile.open()) 
   {
@@ -102,7 +101,7 @@ void TopicShotter::onNewTime(qint64 time)
   connect(t, &QTimer::timeout, this, [this, inputX, inputY, inputW, inputH, _screen]() 
   {
     const WId winId = m_screen->winId();
-    DEBUG_LOG(m_logger) << "## CHEESE! ## grabWindow: x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH << ", name: " << m_topicName << ", id: " << m_topicId << ", desc: " << m_desc;
+    DEBUG_LOG() << "## CHEESE! ## grabWindow: x: " << inputX << ", y: " << inputY << ", w: " << inputW << ", h: " << inputH << ", name: " << m_topicName << ", id: " << m_topicId << ", desc: " << m_desc;
     const QPixmap pix = _screen->grabWindow(winId, inputX, inputY, inputW, inputH); 
 
     if (!pix.save(&m_tmpFile, "PNG"))

qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_topic_shotter.h

@@ -54,8 +54,6 @@ private:
   bool isStarted { false };
   const bool m_isFilterTopic;
   QString m_desc;
-
-  LOGGER_T m_logger;
 }; 
 
 }