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
+8
-9
@@ -59,7 +59,6 @@ TimelineViewDialog::TimelineViewDialog(const QString &menuGroup, const LtsWidget
|
||||
, m_armed(false)
|
||||
, m_exerciseStart(0)
|
||||
, m_legendDialog(nullptr)
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -274,7 +273,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
|
||||
|
||||
if (!m_model->init(eemForeign, mrkDtc, exmDtc, ppmDtc, pdmDtc, ismDtc, session, m_detailData, m_streamNameMapping))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "model init failed";
|
||||
ERROR_LOG() << "model init failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -403,7 +402,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
|
||||
{
|
||||
|
||||
|
||||
WARNING_LOG(m_logger) << "reimpl me!!";
|
||||
WARNING_LOG() << "reimpl me!!";
|
||||
});
|
||||
|
||||
cacheDialog->setAttribute(Qt::WA_DeleteOnClose, true);
|
||||
@@ -430,7 +429,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
|
||||
|
||||
if (!m_model->hasActiveEventTypes())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "range changed, but no active event types! not arming timer..";
|
||||
DEBUG_LOG() << "range changed, but no active event types! not arming timer..";
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -470,7 +469,7 @@ bool TimelineViewDialog::init(const std::shared_ptr<TimeLineManagement::ForeignD
|
||||
if (m_exerciseStart < 1)
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(m_session->baseLayout(), tr("Exercise data not available or exercise not started yet."), tr("Cannot open timeline"));
|
||||
ERROR_LOG(m_logger) << "exercise data not available - exercise start: " << m_exerciseStart;
|
||||
ERROR_LOG() << "exercise data not available - exercise start: " << m_exerciseStart;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -624,7 +623,7 @@ void TimelineViewDialog::slotStartReplaySituation()
|
||||
if (rp.id() == 0)
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session in stage 1."));
|
||||
WARNING_LOG(m_logger) << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId() <<
|
||||
WARNING_LOG() << "[timeout] Error while trying to create a replay session: domainId: " << m_session->domainId() <<
|
||||
" - replay partition does not exist - replay id: " << m_requestHelper->getRepliedId() <<
|
||||
" - url " << m_session->tcpConnectionUrl().toString();
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Import, true);
|
||||
@@ -638,7 +637,7 @@ void TimelineViewDialog::slotStartReplaySituation()
|
||||
if (m_replayApp == nullptr)
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Error trying to create a replay session in stage 2."));
|
||||
WARNING_LOG(m_logger) << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
|
||||
WARNING_LOG() << "Error while trying to create a replay session: domainId: " << m_session->domainId() <<
|
||||
" - partition create reply (failed) - replay id: " << m_requestHelper->getRepliedId() <<
|
||||
" - url: " << m_session->tcpConnectionUrl().toString();
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Import, true);
|
||||
@@ -990,12 +989,12 @@ void TimelineViewDialog::slotWaitForReady()
|
||||
if (partitionTime < ex.beginTime())
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("The current time is outside of the Exercise's period.<br>Events are only recorded in Exercise period boundaries."), tr("No Events available"));
|
||||
WARNING_LOG(m_logger) << "Partition time was " << partitionTime << ", exercise begin time: " << ex.beginTime();
|
||||
WARNING_LOG() << "Partition time was " << partitionTime << ", exercise begin time: " << ex.beginTime();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
WARNING_LOG(m_logger) << "TimelineViewDialog::init: could not check exercise's boundaries!";
|
||||
WARNING_LOG() << "TimelineViewDialog::init: could not check exercise's boundaries!";
|
||||
}
|
||||
|
||||
LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
|
||||
|
||||
Reference in new issue
Block a user