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
@@ -25,7 +25,6 @@ InfoDialog::InfoDialog(int iedEntityId, QWidget *parent)
|
||||
, m_asbIfc(nullptr)
|
||||
, m_symbolWatcher(nullptr)
|
||||
, m_ui(new Ui::InfoDialog)
|
||||
, m_logger(getLogger("IedInfoDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-1
@@ -68,6 +68,5 @@ private:
|
||||
AdvancedSymbology::SymbolResultWatcherLabel *m_symbolWatcher;
|
||||
|
||||
Ui::InfoDialog* m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+4
-5
@@ -30,7 +30,6 @@ PairingEditDialog::PairingEditDialog(LtsSession::LtsSession *session, QWidget *p
|
||||
, m_ppmGuiCbxIfc(nullptr)
|
||||
, m_participantModel(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("GuezIedManangementPairingEditDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_uiRequirements->addRequirement({m_ui->lblPairingState, [this]() { return applyPairingStateCheck(); }});
|
||||
@@ -48,21 +47,21 @@ bool PairingEditDialog::init(LtsSession::LtsSessionDataDds *session)
|
||||
m_sessionData->getDtc<GuezIedManagement::DataInterface>(m_dtc);
|
||||
if (!m_dtc || !m_dtc->enableIed())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "could not enable Ied DDS-objects in GuezIedManagement DTC ";
|
||||
ERROR_LOG() << "could not enable Ied DDS-objects in GuezIedManagement DTC ";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_sessionData->getFtc<GuezIedManagement::DataInterface>(m_ftc);
|
||||
if (!m_ftc || !m_ftc->enablePairIed())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "could not enable pair Ied DDS-Function in GuezIedManagement FTC ";
|
||||
ERROR_LOG() << "could not enable pair Ied DDS-Function in GuezIedManagement FTC ";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_sessionData->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc);
|
||||
if (!m_ppmDtc || !m_ppmDtc->enableParticipant())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "could not enable Participant DDS-objects in ParticipantManagement DTC ";
|
||||
ERROR_LOG() << "could not enable Participant DDS-objects in ParticipantManagement DTC ";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -132,7 +131,7 @@ void PairingEditDialog::onIedChanged(const Ied &data, DataModification modType)
|
||||
|
||||
void PairingEditDialog::onParticipantSelected(const QModelIndex &idx)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Index of Item: " << idx.row() << " " << idx.column();
|
||||
DEBUG_LOG() << "Index of Item: " << idx.row() << " " << idx.column();
|
||||
if (checkSelectedParticipantType())
|
||||
{
|
||||
Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt());
|
||||
|
||||
-1
@@ -77,7 +77,6 @@ private:
|
||||
ParticipantManagement::ParticipantEditModel *m_participantModel;
|
||||
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user