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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316

No files matched your search

@@ -30,7 +30,6 @@ SAABEdit::SAABEdit(LtsSession::LtsSession *session, QWidget *parent)
, m_pModelSystem(nullptr)
, m_pModelImport(nullptr)
, m_ui(new Ui::SAABDialog)
, m_logger(getLogger("SAABEdit"))
{
m_ui->setupUi(this);
@@ -76,7 +76,6 @@ private:
ParticipantEditModel *m_pModelImport;
Ui::SAABDialog *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -36,7 +36,7 @@ SET(zwmssaab_UICS
)
NGL_WRAP_UI(zwmssaab_SRCS ${zwmssaab_UICS})
NGL_ADD_LIBRARY(WS zwmssaab SHARED ${zwmssaab_SRCS} ${zwmssaab_UICS} ${zwmssaab_IDLS})
NGL_ADD_LIBRARY2(WS zwmssaab SHARED ${zwmssaab_SRCS} ${zwmssaab_UICS} ${zwmssaab_IDLS})
NGL_TARGET_INCLUDE_DIRECTORIES(zwmssaab
PUBLIC
${CMAKE_CURRENT_BINARY_DIR}
@@ -45,7 +45,6 @@ ExportSaab::ExportSaab(LtsSession::LtsSession *session, const std::shared_ptr<Pa
, m_session(session)
, m_configFile(nullptr)
, m_ui(new Ui_SAABExport)
, m_logger(getLogger("ExportSaab"))
{
m_ui->setupUi(this);
@@ -92,14 +91,14 @@ void ExportSaab::onStartExport()
if (!file.open(QIODevice::WriteOnly))
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Not possible to start export. You do not have the permission to write the selected file."));
ERROR_LOG(m_logger) << "Could not export exercise: \"" << strExportFile << "\" could not be opened for writing";
ERROR_LOG() << "Could not export exercise: \"" << strExportFile << "\" could not be opened for writing";
return;
}
if (!isValidConfigFile())
{
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Not possible to start export. Config file invalid."));
ERROR_LOG(m_logger) << "Could not export exercise: \"" << strConfigFile << "\" invalid";
ERROR_LOG() << "Could not export exercise: \"" << strConfigFile << "\" invalid";
return;
}
@@ -182,13 +181,13 @@ bool ExportSaab::isValidConfigFile()
{
if (!m_configFile)
{
ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
ERROR_LOG() << "Not possible to read config: No file selected";
return false;
}
if (!m_configFile->open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
ERROR_LOG() << "Not possible to read config: Could not open file \""
<< m_configFile->fileName()
<< "\" for reading.";
return false;
@@ -218,11 +217,11 @@ bool ExportSaab::isValidConfigFile()
m_configFile->close();
if (!hasEchelons)
ERROR_LOG(m_logger) << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
if (!hasSymbols)
ERROR_LOG(m_logger) << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
if (!hasForces)
ERROR_LOG(m_logger) << "Could not find " << SAAB_FORCES() << " in file \"" << m_configFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_FORCES() << " in file \"" << m_configFile->fileName() << '\"';
return hasEchelons && hasSymbols && hasForces;
}
@@ -244,13 +243,13 @@ void ExportSaab::importConfig()
if (!m_configFile)
{
ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
ERROR_LOG() << "Not possible to read config: No file selected";
return;
}
if (!m_configFile->open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
ERROR_LOG() << "Not possible to read config: Could not open file \""
<< m_configFile->fileName()
<< "\" for reading.";
return;
@@ -457,13 +456,13 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
{
if (participant.isDeleted())
{
DEBUG_LOG(m_logger) << "Participant with id " << participant.id() << " id deleted --> skipping";
DEBUG_LOG() << "Participant with id " << participant.id() << " id deleted --> skipping";
return nullptr;
}
if (participant.externalId())
{
DEBUG_LOG(m_logger) << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported.";
DEBUG_LOG() << "Particpant with id " << participant.id() << " has external ID set to " << participant.externalId() << " --> not being exported.";
return nullptr;
}
@@ -492,7 +491,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
{
result = new SaabUnit;
DEBUG_LOG(m_logger) << "Reading unit with " << participant.inferiorIds().size() << " inferiors";
DEBUG_LOG() << "Reading unit with " << participant.inferiorIds().size() << " inferiors";
for (int32_t id : participant.inferiorIds())
{
@@ -500,7 +499,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
if (player == nullptr)
{
DEBUG_LOG(m_logger) << "Skipping inferior with id " << id;
DEBUG_LOG() << "Skipping inferior with id " << id;
continue;
}
@@ -510,7 +509,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
if (!static_cast<SaabUnit *>(result)->inferiors.size())
{
DEBUG_LOG(m_logger) << "Unit " << participant.id() << " has no inferiors.";
DEBUG_LOG() << "Unit " << participant.id() << " has no inferiors.";
return nullptr;
}
@@ -520,7 +519,7 @@ SaabPlayer *ExportSaab::toSaabPlayer(const ParticipantManagement::Participant &p
case ParticipantManagement::TypeClass::Aircraft:
case ParticipantManagement::TypeClass::Unknown:
default:
DEBUG_LOG(m_logger) << "Type " << participant.typeId() << " is not supported.";
DEBUG_LOG() << "Type " << participant.typeId() << " is not supported.";
return nullptr;
}
@@ -35,7 +35,7 @@ ImportSaab::ImportSaab(ParticipantManagement::ParticipantEditModel *pModel, cons
if (!pSession->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc) || !pSession->getFtc<ParticipantManagement::DataInterface>(m_ppmFtc))
{
ERROR_LOG(m_logger) << "Fetching m_ppmDtc or m_ppmFtc failed!";
ERROR_LOG() << "Fetching m_ppmDtc or m_ppmFtc failed!";
setEnabled(false);
}
else
@@ -230,13 +230,13 @@ void ImportSaab::importOrbat()
{
if (!m_xmlFile)
{
ERROR_LOG(m_logger) << "Not possible to import ORBAT: No file selected";
ERROR_LOG() << "Not possible to import ORBAT: No file selected";
return;
}
if (!m_xmlFile->open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Not possible to import ORBAT: Could not open file \""
ERROR_LOG() << "Not possible to import ORBAT: Could not open file \""
<< m_xmlFile->fileName()
<< "\" for reading.";
return;
@@ -267,7 +267,7 @@ void ImportSaab::importOrbat()
if (m_logger.isDebugEnabled())
{
for (SaabUnit *u : std::as_const(m_rootUnits))
DEBUG_LOG(m_logger) << u->toString();
DEBUG_LOG() << u->toString();
}
m_xmlFile->close();
@@ -290,13 +290,13 @@ void ImportSaab::importConfig()
if (!m_configFile)
{
ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
ERROR_LOG() << "Not possible to read config: No file selected";
return;
}
if (!m_configFile->open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
ERROR_LOG() << "Not possible to read config: Could not open file \""
<< m_configFile->fileName()
<< "\" for reading.";
return;
@@ -374,7 +374,7 @@ QVector<SaabPlayer *> ImportSaab::inferiors(SaabPlayer *player) const
SaabPlayer *ImportSaab::readUnit(QXmlStreamReader *reader) const
{
DEBUG_LOG(m_logger) << "reading unit: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
DEBUG_LOG() << "reading unit: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
SaabUnit *result = new SaabUnit;
@@ -433,7 +433,7 @@ SaabPlayer *ImportSaab::readUnit(QXmlStreamReader *reader) const
int index = playerIndexByGuid(result->guid, result->inferiors);
if (index < 0)
WARNING_LOG(m_logger) << SAAB_POSITION_BY_PLAYER_ID() << " set, but GUID " << result->positionByPlayerId << " could not be found.";
WARNING_LOG() << SAAB_POSITION_BY_PLAYER_ID() << " set, but GUID " << result->positionByPlayerId << " could not be found.";
else
result->inferiors.prepend(result->inferiors.takeAt(index));
}
@@ -443,21 +443,21 @@ SaabPlayer *ImportSaab::readUnit(QXmlStreamReader *reader) const
SaabPlayer *ImportSaab::readOcPlayer(QXmlStreamReader *reader) const
{
DEBUG_LOG(m_logger) << "reading oc player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
DEBUG_LOG() << "reading oc player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
return readPersonOcPlayer<SaabOcPlayer>(reader, XmlStrings::SAAB_OC_PLAYER());;
}
SaabPlayer *ImportSaab::readPersonPlayer(QXmlStreamReader *reader) const
{
DEBUG_LOG(m_logger) << "reading person player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
DEBUG_LOG() << "reading person player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
return readPersonOcPlayer<SaabPersonPlayer>(reader, XmlStrings::SAAB_PERSON_PLAYER());
}
SaabPlayer *ImportSaab::readVehiclePlayer(QXmlStreamReader *reader) const
{
DEBUG_LOG(m_logger) << "reading vehicle player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
DEBUG_LOG() << "reading vehicle player: tokentype: " << reader->tokenString() << " | name: " << reader->name().toString();
using namespace XmlStrings;
@@ -468,7 +468,7 @@ SaabPlayer *ImportSaab::readVehiclePlayer(QXmlStreamReader *reader) const
SaabVehicle vehicle = saabVehicleByGUID(reader->readElementText());
if (vehicle.guid.isEmpty())
WARNING_LOG(m_logger) << SAAB_VEHICLE_REF_ID() << " set, but GUID " << result->refId << " could not be found.";
WARNING_LOG() << SAAB_VEHICLE_REF_ID() << " set, but GUID " << result->refId << " could not be found.";
else
{
result->registrationNumber = vehicle.registrationNumber;
@@ -577,7 +577,7 @@ void ImportSaab::buildImportTreeView(const QVector<SaabPlayer *> &vecUnitsWithVa
if (vecUnitsWithValidDISTypes.contains(player->superior))
tmp.append(player);
else
WARNING_LOG(m_logger) << "Parent missing: Could not import player " << player->designation;
WARNING_LOG() << "Parent missing: Could not import player " << player->designation;
continue;
}
@@ -595,13 +595,13 @@ bool ImportSaab::isValidSaabOrbatFile() const
{
if (!m_xmlFile)
{
ERROR_LOG(m_logger) << "Not possible to import ORBAT: No file selected";
ERROR_LOG() << "Not possible to import ORBAT: No file selected";
return false;
}
if (!m_xmlFile->open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Not possible to import ORBAT: Could not open file \""
ERROR_LOG() << "Not possible to import ORBAT: Could not open file \""
<< m_xmlFile->fileName()
<< "\" for reading.";
return false;
@@ -631,11 +631,11 @@ bool ImportSaab::isValidSaabOrbatFile() const
m_xmlFile->close();
if (!hasExerciseOrbatRoot)
ERROR_LOG(m_logger) << "Could not find " << SAAB_EXERCISE_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_EXERCISE_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
if (!hasExercise)
ERROR_LOG(m_logger) << "Could not find " << SAAB_EXERCISE() << " in file \"" << m_xmlFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_EXERCISE() << " in file \"" << m_xmlFile->fileName() << '\"';
if (!hasOrbat)
ERROR_LOG(m_logger) << "Could not find " << SAAB_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_ORBAT() << " in file \"" << m_xmlFile->fileName() << '\"';
return hasExerciseOrbatRoot && hasExercise && hasOrbat;
}
@@ -644,13 +644,13 @@ bool ImportSaab::isValidConfigFile() const
{
if (!m_configFile)
{
ERROR_LOG(m_logger) << "Not possible to read config: No file selected";
ERROR_LOG() << "Not possible to read config: No file selected";
return false;
}
if (!m_configFile->open(QIODevice::ReadOnly))
{
ERROR_LOG(m_logger) << "Not possible to read config: Could not open file \""
ERROR_LOG() << "Not possible to read config: Could not open file \""
<< m_configFile->fileName()
<< "\" for reading.";
return false;
@@ -677,9 +677,9 @@ bool ImportSaab::isValidConfigFile() const
m_configFile->close();
if (!hasEchelons)
ERROR_LOG(m_logger) << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_ECHELONS() << " in file \"" << m_configFile->fileName() << '\"';
if (!hasSymbols)
ERROR_LOG(m_logger) << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
ERROR_LOG() << "Could not find " << SAAB_SYMBOLS() << " in file \"" << m_configFile->fileName() << '\"';
return hasEchelons && hasSymbols;
}