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>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+11
-12
@@ -32,7 +32,6 @@ MainHandlerSqlite::MainHandlerSqlite()
|
||||
, m_staticPublisher(nullptr)
|
||||
, m_ddsInterface(nullptr)
|
||||
, m_dbHandler(nullptr)
|
||||
, m_logger(getLogger("MainHandlerSqlite"))
|
||||
{}
|
||||
|
||||
MainHandlerSqlite::~MainHandlerSqlite()
|
||||
@@ -54,7 +53,7 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
|
||||
{
|
||||
if (!m_ddsInterface)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "dds must be initialized first!";
|
||||
WARNING_LOG() << "dds must be initialized first!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -103,15 +102,15 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(partitionIdIn, m_dbSqlite))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation dbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "opening sqlite db successful";
|
||||
DEBUG_LOG() << "opening sqlite db successful";
|
||||
|
||||
m_dbReader = std::make_shared<DbReader>(m_ddsInterface->ddsReplay(), partitionIdIn, false);
|
||||
if (!m_dbReader->init(m_dbHandler->db()->database()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize database reader";
|
||||
ERROR_LOG() << "Could not initialize database reader";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -121,7 +120,7 @@ bool MainHandlerSqlite::initDb(const ReplayInformation &replayInformation,
|
||||
if (!initSrpHandler(partitionIdIn, m_ddsInterface->ddsReplay()->getPartitionId(),
|
||||
replayInformation.timeSpan.begin, replayInformation.timeSpan.end))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not initialize situation replay handler";
|
||||
ERROR_LOG() << "Could not initialize situation replay handler";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -179,14 +178,14 @@ bool MainHandlerSqlite::loadReplayConfig(const QString &replayConfigPath)
|
||||
QFile f(replayConfigPath);
|
||||
if (!f.open(QIODevice::ReadOnly))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not open '" << replayConfigPath << "' for reading - no replay config loaded";
|
||||
WARNING_LOG() << "Could not open '" << replayConfigPath << "' for reading - no replay config loaded";
|
||||
return false;
|
||||
}
|
||||
QJsonParseError error;
|
||||
const QJsonDocument doc(QJsonDocument::fromJson(f.readAll(), &error));
|
||||
if (error.error != QJsonParseError::NoError)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not parse replay config loaded json file: " << error.errorString();
|
||||
WARNING_LOG() << "Could not parse replay config loaded json file: " << error.errorString();
|
||||
return false;
|
||||
}
|
||||
const QJsonObject obj = doc.object();
|
||||
@@ -247,7 +246,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
|
||||
return;
|
||||
m_curOverlayArrayIdx = nextIdx;
|
||||
m_currentVisibleOverlays += m_overlays.at(nextIdx);
|
||||
DEBUG_LOG(m_logger) << "Showing new overlay with id " << m_overlays.at(m_curOverlayArrayIdx).overlayId
|
||||
DEBUG_LOG() << "Showing new overlay with id " << m_overlays.at(m_curOverlayArrayIdx).overlayId
|
||||
<< " at time " << curTime;
|
||||
emit applyNewOverlay(m_overlays.at(m_curOverlayArrayIdx).overlayId);
|
||||
}
|
||||
@@ -255,7 +254,7 @@ void MainHandlerSqlite::maybeAddNewOverlay(qint64 curTime)
|
||||
|
||||
void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " curTime = "<< curTime
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " curTime = "<< curTime
|
||||
<< " m_currentVisibleOverlays.size()= "<< m_currentVisibleOverlays.size();
|
||||
|
||||
const qint64 curTimeRelative = curTime - m_replay.timeSpan.begin + m_replay.relativeTimeSpan.begin; // + m_replay.relativeTimeSpan.begin
|
||||
@@ -263,7 +262,7 @@ void MainHandlerSqlite::removeOutdatedOverlays(qint64 curTime)
|
||||
{
|
||||
const qint64 endTime = m_currentVisibleOverlays.at(i).relativeTimeSpan.end;
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " endTime = " << endTime;
|
||||
|
||||
if (curTimeRelative > endTime)
|
||||
{
|
||||
@@ -309,7 +308,7 @@ int MainHandlerSqlite::findNextIndex(qint64 curTime, int curIdx, const QVector<F
|
||||
// startTime: msec, rel. to begin of SCRIPT
|
||||
const qint64 startTime = data.at(nextIdx).relativeTimeSpan.begin;
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " curTimeRelative = " << curTimeRelative << " startTime = " << startTime;
|
||||
|
||||
if (curTimeRelative < startTime)
|
||||
return -1;
|
||||
|
||||
Reference in new issue
Block a user