lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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>
This commit is contained in:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/topic_replay.cpp
+31 -32
View File
@@ -50,15 +50,14 @@ private:
TopicReplay::TopicReplay(DataInterface *dataIfc, bool isAudio)
: m_isAudio(isAudio)
, m_dataIfc(dataIfc)
, m_logger(getLogger("TopicReplay"))
{
DEBUG_LOG(m_logger) << "TopicReplay::TopicReplay()";
DEBUG_LOG() << "TopicReplay::TopicReplay()";
Q_ASSERT(dataIfc);
}
TopicReplay::~TopicReplay()
{
DEBUG_LOG(m_logger) << "TopicReplay::~TopicReplay()";
DEBUG_LOG() << "TopicReplay::~TopicReplay()";
if (m_isPlaying)
playbackStop();
@@ -66,7 +65,7 @@ TopicReplay::~TopicReplay()
QWidget *TopicReplay::createWidget()
{
DEBUG_LOG(m_logger) << "TopicReplay::createWidget()";
DEBUG_LOG() << "TopicReplay::createWidget()";
Q_ASSERT(!m_screenPlacementHelper);
if (m_isAudio)
@@ -81,19 +80,19 @@ QWidget *TopicReplay::createWidget()
void TopicReplay::slotSetScriptResponse(const AudioVideoManagement::AvaStreamInfo &streamInfo, AudioVideoManagement::AvaStreamState streamState)
{
if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
ERROR_LOG(m_logger) << "Script could not be set";
ERROR_LOG() << "Script could not be set";
else
ERROR_LOG(m_logger) << "Script set!";
ERROR_LOG() << "Script set!";
ERROR_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
ERROR_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
ERROR_LOG() << "streamInfo: start" << streamInfo.duration.count();
ERROR_LOG() << "streamState: " << static_cast<int>(streamState);
}
bool TopicReplay::playbackInit(const QJsonObject &attributes)
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackInit()";
DEBUG_LOG(m_logger) << QJsonDocument(attributes).toJson();
DEBUG_LOG() << "TopicReplay::playbackInit()";
DEBUG_LOG() << QJsonDocument(attributes).toJson();
if (m_screenPlacementHelper && !m_isAudio)
m_screenPlacementHelper->show();
@@ -104,7 +103,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "no ava control!";
ERROR_LOG() << "no ava control!";
return false;
}
@@ -112,7 +111,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
if (!topicData.isValid)
{
ERROR_LOG(m_logger) << "topicData is invalid";
ERROR_LOG() << "topicData is invalid";
return false;
}
@@ -123,7 +122,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
if (app == nullptr || app->inUse())
{
ERROR_LOG(m_logger) << "app invalid or in use!";
ERROR_LOG() << "app invalid or in use!";
return false;
}
@@ -143,7 +142,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app after creating appHandle!";
ERROR_LOG() << "appHandle: missing app after creating appHandle!";
return false;
}
@@ -151,7 +150,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
NGL::Settings s({});
bool isLocal = s.isDatabaseConnectionLocal();
DEBUG_LOG(m_logger) << "isLocal? " << isLocal;
DEBUG_LOG() << "isLocal? " << isLocal;
AvaScriptSource source;
if (isLocal)
@@ -169,7 +168,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
source = AvaScriptSource::ServerVideo;
}
DEBUG_LOG(m_logger) << "source: " << static_cast<int>(source);
DEBUG_LOG() << "source: " << static_cast<int>(source);
ctrl->setScript(m_appHandle.dialogId(), m_scriptName,
source, topicData.streamList(),
@@ -181,7 +180,7 @@ bool TopicReplay::playbackInit(const QJsonObject &attributes)
bool TopicReplay::playbackStart(int secondsOffset)
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackStart()";
DEBUG_LOG() << "TopicReplay::playbackStart()";
if (m_screenPlacementHelper && !m_isAudio)
m_screenPlacementHelper->show();
@@ -189,7 +188,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "ctrl == nullptr";
ERROR_LOG() << "ctrl == nullptr";
return false;
}
@@ -197,7 +196,7 @@ bool TopicReplay::playbackStart(int secondsOffset)
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app!";
ERROR_LOG() << "appHandle: missing app!";
return false;
}
@@ -205,13 +204,13 @@ bool TopicReplay::playbackStart(int secondsOffset)
ctrl->startScript(m_appHandle.dialogId(), m_scriptName);
m_isPlaying = true;
DEBUG_LOG(m_logger) << "m_isPlaying = true";
DEBUG_LOG() << "m_isPlaying = true";
return true;
}
bool TopicReplay::playbackPause()
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackPause()";
DEBUG_LOG() << "TopicReplay::playbackPause()";
if (m_screenPlacementHelper)
m_screenPlacementHelper->hide();
@@ -222,13 +221,13 @@ bool TopicReplay::playbackPause()
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "no ctrl!";
ERROR_LOG() << "no ctrl!";
return false;
}
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app!";
ERROR_LOG() << "appHandle: missing app!";
return false;
}
@@ -238,7 +237,7 @@ bool TopicReplay::playbackPause()
bool TopicReplay::playbackStop()
{
DEBUG_LOG(m_logger) << "TopicReplay::playbackStop()";
DEBUG_LOG() << "TopicReplay::playbackStop()";
if (m_screenPlacementHelper)
m_screenPlacementHelper->hide();
@@ -249,13 +248,13 @@ bool TopicReplay::playbackStop()
AvaControl *ctrl = getAvaControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "no ctrl!";
ERROR_LOG() << "no ctrl!";
return false;
}
if (!m_appHandle)
{
ERROR_LOG(m_logger) << "appHandle: missing app!";
ERROR_LOG() << "appHandle: missing app!";
return false;
}
@@ -275,7 +274,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
VdControl *ctrl = getVdControl();
if (ctrl == nullptr)
{
ERROR_LOG(m_logger) << "ctrl missing!";
ERROR_LOG() << "ctrl missing!";
exportNotifier->setExportFailed();
return false;
}
@@ -287,7 +286,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
if (!topicData.isValid)
{
ERROR_LOG(m_logger) << "topicData is invalid";
ERROR_LOG() << "topicData is invalid";
exportNotifier->setExportFailed();
return false;
}
@@ -305,7 +304,7 @@ bool TopicReplay::exportTopic(const QJsonObject &attributes,
void TopicReplay::onWidgetPlaced(const QRect &geometry)
{
WARNING_LOG(m_logger) << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
WARNING_LOG() << "TopicReplay::onWidgetPlaced() - geo: " << geometry.x() << "/" << geometry.y()
<< " m_isAudio=" << m_isAudio;
m_dialogGeometry = geometry;
@@ -316,17 +315,17 @@ void TopicReplay::onWidgetPlaced(const QRect &geometry)
PlaybackApp *app = m_isAudio ? m_dataIfc->audioPresentationApp() : m_dataIfc->videoPresentationApp();
if (app == nullptr)
{
ERROR_LOG(m_logger) << "app missing!";
ERROR_LOG() << "app missing!";
return;
}
if (!app->inUse())
{
ERROR_LOG(m_logger) << "app not in use - waiting for playbackInit to aquire it";
ERROR_LOG() << "app not in use - waiting for playbackInit to aquire it";
return;
}
DEBUG_LOG(m_logger) << "setGeometry";
DEBUG_LOG() << "setGeometry";
app->setGeometry(*m_dialogGeometry);
}