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
+1
-2
@@ -27,7 +27,6 @@ ChargeAdministrationAdlerList::ChargeAdministrationAdlerList(QWidget *parent)
|
||||
, m_session(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ChargeAdministrationList)
|
||||
, m_logger(getLogger("ChargeAdministrationAdlerList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -62,7 +61,7 @@ bool ChargeAdministrationAdlerList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+5
-6
@@ -58,7 +58,6 @@ ChargeAdministrationAdlerModel::ChargeAdministrationAdlerModel(QObject *parent)
|
||||
tr("Total Stock"),
|
||||
tr("Gear Class")},
|
||||
parent)
|
||||
, m_logger(getLogger("ChargeAdministration"))
|
||||
{}
|
||||
|
||||
bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
|
||||
@@ -80,7 +79,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
|
||||
QMap<qint32, ParticipantManagement::Party> parties;
|
||||
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
|
||||
{
|
||||
DEBUG_LOG (m_logger) << "Could not retrieve visible Parties!";
|
||||
DEBUG_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -105,7 +104,7 @@ void ChargeAdministrationAdlerModel::onStateChanged(const ParticipantManagement:
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "+++++++++ DataModification --> " << modType;
|
||||
DEBUG_LOG() << "+++++++++ DataModification --> " << modType;
|
||||
updateParticipantChargeTypeMap(data);
|
||||
|
||||
updateItem(m_ppmDtc->participant(data.participantId()).partyId());
|
||||
@@ -189,10 +188,10 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
{
|
||||
if (participantCharges.partyId != partyId)
|
||||
continue;
|
||||
DEBUG_LOG(m_logger) << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
|
||||
DEBUG_LOG() << "+++++++++ ParticipantId -> " << participantCharges.participantId << ", sampleTime ->" << sampleTime;
|
||||
for (auto it = participantCharges.chargeTypeTotalStockMap.cbegin(), end = participantCharges.chargeTypeTotalStockMap.cend(); it != end; ++it)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
|
||||
DEBUG_LOG() << "+++++++++ chargeRemain ->" << it.key() << ": " << it.value().remain
|
||||
<< it.value().lastUpdate;
|
||||
GearData data;
|
||||
data.lastUpdate = it.value().lastUpdate;
|
||||
@@ -212,7 +211,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
item.partyId = partyId;
|
||||
for (auto gearData = chargeTypeGearData.cbegin(), end = chargeTypeGearData.cend(); gearData != end; ++gearData)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
|
||||
DEBUG_LOG() << "### PartyId " << item.partyId << " insert item -> chargeTypeId: " << gearData.key() << ", amount: " << gearData.value().remain
|
||||
<< ", lastUpdate:" << gearData.value().lastUpdate;
|
||||
|
||||
item.chargeTypeId = gearData.key();
|
||||
|
||||
+1
-2
@@ -31,7 +31,6 @@ ChargeAdministrationList::ChargeAdministrationList(QWidget *parent)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ChargeAdministrationList)
|
||||
, m_logger(getLogger("ChargeAdministrationList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -70,7 +69,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
if (m_session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
m_session = session;
|
||||
|
||||
+2
-3
@@ -59,7 +59,6 @@ ChargeAdministrationModel::ChargeAdministrationModel(QObject *parent)
|
||||
tr("Used"),
|
||||
tr("Gear Class")},
|
||||
parent)
|
||||
, m_logger(getLogger("ChargeAdministration"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -67,7 +66,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
|
||||
{
|
||||
if (m_aesDtc)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "double init()!";
|
||||
ERROR_LOG() << "double init()!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -102,7 +101,7 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
|
||||
QMap<qint32, ParticipantManagement::Party> parties;
|
||||
if (!ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(session->exerciseId())))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
|
||||
ERROR_LOG() << "Could not retrieve visible Parties!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user