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

@@ -31,7 +31,6 @@ ExerciseManagementDialog::ExerciseManagementDialog(const QString &menuGroup, QWi
, m_ftc(nullptr)
, m_menuGroup(menuGroup)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManagementDialog"))
{
m_ui->setupUi(this);
setOnlineHelpFilename(QStringLiteral("Administrator-Exercises"));
@@ -166,7 +165,7 @@ void ExerciseManagementDialog::onEditExercise()
if (ex.id() <= 0)
return;
DEBUG_LOG(m_logger) << "current EXId: " << ex.id();
DEBUG_LOG() << "current EXId: " << ex.id();
ExerciseManagementEditDialog *dialog = new ExerciseManagementEditDialog(this);
@@ -55,7 +55,5 @@ private:
std::shared_ptr<FileManagement::Interface::Ftc> m_flmFtc;
QString m_menuGroup;
LtsUtils::RequestHelper *m_requestHelper;
LOGGER_T m_logger;
};
}
@@ -38,7 +38,6 @@ ExerciseManagementDialogModel::ExerciseManagementDialogModel(QObject *parent)
, m_exmDtc(nullptr)
, m_asmDtc(nullptr)
, m_pdmDtc(nullptr)
, m_logger(getLogger("ExerciseManagementDialogModel"))
{}
bool ExerciseManagementDialogModel::initModel(const std::shared_ptr<ExerciseManagement::Interface::Dtc> &dtc,
@@ -84,7 +83,7 @@ bool ExerciseManagementDialogModel::initModel(const std::shared_ptr<ExerciseMana
addImagePreload(ex.id());
});
INFO_LOG(m_logger) << "initModel - #exercises: " << m_vecData.size();
INFO_LOG() << "initModel - #exercises: " << m_vecData.size();
return true;
}
@@ -145,7 +144,7 @@ GetExerciseImageRequester *ExerciseManagementDialogModel::createGetExerciseImage
for (const std::string &arg : std::as_const(reply.errorParams()))
msg = msg.arg(QString::fromStdString(arg));
ERROR_LOG(m_logger) << "image preload failed: " << msg;
ERROR_LOG() << "image preload failed: " << msg;
}
QTimer::singleShot(1, this, &ExerciseManagementDialogModel::preloadNextImage);
@@ -122,9 +122,6 @@ private:
QMap<int32_t , QByteArray > m_exerciseImages;
bool m_imagePreloadPending { false };
QSize m_imageSize;
LOGGER_T m_logger;
friend class ExerciseManagementProxyModel;
};
@@ -39,7 +39,6 @@ ExerciseManagementEditDialog::ExerciseManagementEditDialog(QWidget *parent)
, m_currentState(ExerciseState::Unknown)
, m_menuGroup()
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManangementEditDialog"))
{
m_ui->setupUi(this);
@@ -331,7 +330,7 @@ void ExerciseManagementEditDialog::onGetExerciseImageReply(const GetExerciseImag
for (const std::string &arg : std::as_const(reply.errorParams()))
msg = msg.arg(QString::fromStdString(arg));
ERROR_LOG(m_logger) << "loading exercise image failed: " << msg;
ERROR_LOG() << "loading exercise image failed: " << msg;
@@ -441,7 +440,7 @@ void ExerciseManagementEditDialog::onEditVisibleParties()
if (operatorId <= 0 || isChecked == false || !visibleParties)
return;
DEBUG_LOG(m_logger) << "current Operator Id: " << operatorId;
DEBUG_LOG() << "current Operator Id: " << operatorId;
ExerciseEditPartyDialog *dialog = new ExerciseEditPartyDialog(operatorId, m_exerciseId, m_menuGroup, this);
@@ -460,7 +459,7 @@ void ExerciseManagementEditDialog::onEditExercisePhase()
if (exPhase.id() <= 0)
return;
DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id();
DEBUG_LOG() << "current exPhase Id: " << exPhase.id();
ExerciseManagementPhaseEditDialog *dialog = new ExerciseManagementPhaseEditDialog(this);
@@ -472,21 +471,21 @@ void ExerciseManagementEditDialog::onEditExercisePhase()
void ExerciseManagementEditDialog::onExport()
{
DEBUG_LOG(m_logger) << "onExport";
DEBUG_LOG() << "onExport";
const QByteArray byteArray = exerciseToJson();
DEBUG_LOG(m_logger) << "Exporting: " << byteArray;
DEBUG_LOG() << "Exporting: " << byteArray;
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, 0, byteArray);
if (fileId > 0)
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
DEBUG_LOG() << "Saved file with id = " << fileId;
else
ERROR_LOG(m_logger) << "Could not save file in library ";
ERROR_LOG() << "Could not save file in library ";
}
void ExerciseManagementEditDialog::onImport()
{
DEBUG_LOG(m_logger) << "onImport";
DEBUG_LOG() << "onImport";
QByteArray content;
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, 0, JsonKeys::XMLTYPEVALUE());
@@ -505,7 +504,7 @@ void ExerciseManagementEditDialog::onImport()
else
{
ExerciseModifyRequest req = jsonToExercise(content);
DEBUG_LOG(m_logger) << "Importing: " << req;
DEBUG_LOG() << "Importing: " << req;
m_ui->pteForces->setPlainText(QString::fromStdString(req.forces()));
m_ui->pteDescription->setPlainText(QString::fromStdString(req.description()));
@@ -894,7 +893,7 @@ bool ExerciseManagementEditDialog::apply()
int newExId = m_requestHelper->getRepliedId();
DEBUG_LOG(m_logger) << "Created new exercise with id " << newExId;
DEBUG_LOG() << "Created new exercise with id " << newExId;
if (newExId > 0)
{
@@ -906,7 +905,7 @@ bool ExerciseManagementEditDialog::apply()
return m_ftc->exerciseImageModifyRequest(exImgRequest, this);
}))
{
WARNING_LOG(m_logger) << "Unable to set default exercise picture";
WARNING_LOG() << "Unable to set default exercise picture";
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Unable to set default exercise picture"));
}
@@ -916,7 +915,7 @@ bool ExerciseManagementEditDialog::apply()
if (!createFolders(newExId))
{
WARNING_LOG(m_logger) << "Unable to create exercise folders in document library.";
WARNING_LOG() << "Unable to create exercise folders in document library.";
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Unable to create exercise folders in document library."));
}
@@ -945,7 +944,7 @@ void ExerciseManagementEditDialog::sendModifiedOperators(int thisExerciseId)
std::shared_ptr<OperatorManagement::Interface::Ftc> opmFtc;
if (!m_session->getFtc<OperatorManagement::DataInterface>(opmFtc))
{
ERROR_LOG(m_logger) << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
ERROR_LOG() << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
return;
}
@@ -971,10 +970,10 @@ void ExerciseManagementEditDialog::sendModifiedOperators(int thisExerciseId)
req.visibleExercises() = user.exerciseIds();
req.visiblePartiesByExercise() = user.visiblePartiesByExercise();
DEBUG_LOG(m_logger) << "Adding request: " << req;
DEBUG_LOG() << "Adding request: " << req;
m_requestHelper->addRequest([this, req, opmFtc]()
{
DEBUG_LOG(m_logger) << "Executing request: " << req;
DEBUG_LOG() << "Executing request: " << req;
return opmFtc->operatorCreateModifyRequest(req, this);
});
@@ -992,7 +991,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
if (folderId <= 0)
return false;
DEBUG_LOG(m_logger) << "Exercise Folder created with id = " << folderId;
DEBUG_LOG() << "Exercise Folder created with id = " << folderId;
folderName = QStringLiteral("Documents") ;
@@ -1001,7 +1000,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
if (subFolderId <= 0)
return false;
DEBUG_LOG(m_logger) << "Sub Folder Documents created with id = " << subFolderId;
DEBUG_LOG() << "Sub Folder Documents created with id = " << subFolderId;
QStringList folderNames;
@@ -1009,7 +1008,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
folderNames << QStringLiteral("Incidents") << QStringLiteral("Instructions");
bool ok = createExerciseFolders(subFolderId, folderNames);
DEBUG_LOG(m_logger) << "Created sub-folders Documents: " << ok;
DEBUG_LOG() << "Created sub-folders Documents: " << ok;
LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance();
@@ -1020,7 +1019,7 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
folderName = QStringLiteral("Phase Documents");
int folderPhaseDocsId = createFolder(subFolderId, folderName);
DEBUG_LOG(m_logger) << "Phase Documents Folder created with id = " << folderPhaseDocsId;
DEBUG_LOG() << "Phase Documents Folder created with id = " << folderPhaseDocsId;
if (folderPhaseDocsId > 0)
@@ -1028,14 +1027,14 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
int phId = m_dtc->exercise(newExId).activePhaseId();
const QString &phaseName = m_flmDtc->getPhaseFolderName(phId);
int folderPhaseId = createFolder(folderPhaseDocsId, phaseName);
DEBUG_LOG(m_logger) << "Phase Folder created with id = " << folderPhaseId;
DEBUG_LOG() << "Phase Folder created with id = " << folderPhaseId;
}
}
folderName = QStringLiteral("Markers");
subFolderId = createFolder(folderId, folderName);
DEBUG_LOG(m_logger) << "Markers Folder created with id = " << subFolderId;
DEBUG_LOG() << "Markers Folder created with id = " << subFolderId;
FileManagement::PathCreateRequest req;
req.parentId(folderId);
@@ -1046,25 +1045,25 @@ bool ExerciseManagementEditDialog::createFolders(int newExId)
bool success = m_flmFtc->pathCreateRequest(req);
if (!success)
ERROR_LOG(m_logger) << "Planning/TNE Lists could not be created";
ERROR_LOG() << "Planning/TNE Lists could not be created";
req.path({"Tactical Plans", "BDA"});
success = m_flmFtc->pathCreateRequest(req);
if (!success)
ERROR_LOG(m_logger) << "Tactical Plans/BDA could not be created";
ERROR_LOG() << "Tactical Plans/BDA could not be created";
req.path({"Tactical Plans", "HQ Data"});
success = m_flmFtc->pathCreateRequest(req);
if (!success)
ERROR_LOG(m_logger) << "Tactical Plans/HQ Data could not be created";
ERROR_LOG() << "Tactical Plans/HQ Data could not be created";
folderNames.clear();
folderNames << QStringLiteral("Reports") << QStringLiteral("Snapshots");
ok = createExerciseFolders(folderId, folderNames);
DEBUG_LOG(m_logger) << "Created last exercise documents: " << ok;
DEBUG_LOG() << "Created last exercise documents: " << ok;
return true;
}
@@ -1087,7 +1086,7 @@ int ExerciseManagementEditDialog::createFolder(int parentFolderId, const QString
return m_flmFtc->folderModifyRequest(req, this);
});
DEBUG_LOG(m_logger) << "Created folder id = " << m_requestHelper->getRepliedId();
DEBUG_LOG() << "Created folder id = " << m_requestHelper->getRepliedId();
return m_requestHelper->getRepliedId();
}
@@ -1240,13 +1239,13 @@ ExerciseModifyRequest ExerciseManagementEditDialog::jsonToExercise(const QByteAr
void ExerciseManagementEditDialog::onCreateFolders()
{
DEBUG_LOG(m_logger) << "onCreateFolders";
DEBUG_LOG() << "onCreateFolders";
if (m_exerciseId > 0 && getExerciseFolder() <= 0 )
{
bool ok = createFolders(m_exerciseId);
if (!ok)
{
WARNING_LOG(m_logger) << "Could not create exercise folders";
WARNING_LOG() << "Could not create exercise folders";
LtsWidgets::LtsMessageDialog::showMessage(this, tr("Could not create exercise folders"));
}
else
@@ -1263,7 +1262,7 @@ int ExerciseManagementEditDialog::getExerciseFolder()
return 0;
const int folderId = m_flmDtc->getExerciseFolderId(m_exerciseId);
DEBUG_LOG(m_logger) << "getExerciseFolder: folderId = " << folderId;
DEBUG_LOG() << "getExerciseFolder: folderId = " << folderId;
return folderId;
}
@@ -151,8 +151,6 @@ private:
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
QString m_menuGroup;
LtsUtils::RequestHelper *m_requestHelper{nullptr};
LOGGER_T m_logger;
template<class T>
bool removeElement(std::vector<T> &vec, T elem);
bool hasVisibleParties(const std::vector<OperatorManagement::PartiesByExercise> vpbe) const;
@@ -34,7 +34,6 @@ ExerciseEditPartyDialog::ExerciseEditPartyDialog(const int operatorId,
, m_opmDtc(nullptr)
, m_opmFtc(nullptr)
, m_ui(new Ui::ExerciseEditPartyDialog)
, m_logger(getLogger("exerciseEditPartyDialog"))
, m_requestHelper(new LtsUtils::RequestHelper(this))
{
setNoTopicLock();
@@ -91,7 +90,7 @@ bool ExerciseEditPartyDialog::init(LtsSession::LtsSessionDataDds *session)
bool ExerciseEditPartyDialog::operatorUpdateVisiblePartiesByExercise(const OperatorManagement::OperatorUpdateVisiblePartiesByExerciseRequest &req)
{
DEBUG_LOG(m_logger) << LOGFUNCTION;
DEBUG_LOG() << Q_FUNC_INFO;
return m_requestHelper->startSingleRequest([this, req]()
{
return m_opmFtc->operatorUpdateVisiblePartiesByExerciseRequest(req, this);
@@ -144,7 +143,7 @@ void ExerciseEditPartyDialog::setAdlerVisiblePartiesUncheckable()
bool ExerciseEditPartyDialog::apply()
{
DEBUG_LOG(m_logger) << LOGFUNCTION;
DEBUG_LOG() << Q_FUNC_INFO;
if (m_operatorId <= 0)
return true;
@@ -164,9 +163,9 @@ bool ExerciseEditPartyDialog::apply()
const QVector<int> hiddenPartyIds = m_visiblePartiesModel->getUncheckedIds();
for (const int visible : visiblePartyIds)
DEBUG_LOG(m_logger) << "visible party: " << visible;
DEBUG_LOG() << "visible party: " << visible;
for (const int hidden : hiddenPartyIds)
DEBUG_LOG(m_logger) << "hidden party: " << hidden;
DEBUG_LOG() << "hidden party: " << hidden;
req.hiddenParties().set({});
req.visibleParties().set({});
std::copy(hiddenPartyIds.begin(), hiddenPartyIds.end(), std::back_inserter(req.hiddenParties().get()));
@@ -174,7 +173,7 @@ bool ExerciseEditPartyDialog::apply()
req.properties(adlerVisiblePartiesToJson().toStdString());
DEBUG_LOG(m_logger) << "----------------- opId: " << req.id() << ", exId:" << req.exerciseId() << ", req.hiddenParties.size:" << hiddenPartyIds.size()
DEBUG_LOG() << "----------------- opId: " << req.id() << ", exId:" << req.exerciseId() << ", req.hiddenParties.size:" << hiddenPartyIds.size()
<< "adlerVisibleParties: " << req.properties();
return operatorUpdateVisiblePartiesByExercise(req);
@@ -207,7 +206,7 @@ void ExerciseEditPartyDialog::onSwitchCheckbox(const QModelIndex &index)
return;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << "index.row():" << index.row();
DEBUG_LOG() << Q_FUNC_INFO << "index.row():" << index.row();
const QPair<bool, ParticipantManagement::Party> row = m_visiblePartiesModel->getRowData(index.row());
QPair<bool, ParticipantManagement::Party> rowAdler = m_adlerVisiblePartiesModel->getRowData(index.row());
@@ -223,7 +222,7 @@ void ExerciseEditPartyDialog::onDoubleClicked(const QModelIndex &index)
return;
}
DEBUG_LOG(m_logger) << LOGFUNCTION << "index.row():" << index.row();
DEBUG_LOG() << Q_FUNC_INFO << "index.row():" << index.row();
bool isChecked = m_visiblePartiesModel->getRowData(index.row()).first;
@@ -66,7 +66,6 @@ private:
std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
std::shared_ptr<OperatorManagement::Interface::Ftc> m_opmFtc;
Ui::ExerciseEditPartyDialog *m_ui;
LOGGER_T m_logger;
LtsUtils::RequestHelper *m_requestHelper;
bool operatorUpdateVisiblePartiesByExercise(const OperatorManagement::OperatorUpdateVisiblePartiesByExerciseRequest &req);
@@ -13,7 +13,6 @@ ExerciseManagementPhaseEditDialog::ExerciseManagementPhaseEditDialog(QWidget *pa
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
, m_ui(new Ui::ExerciseManagementPhaseEditDialog)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManangementPhaseEditDialog"))
{
m_ui->setupUi(this);
@@ -55,6 +55,5 @@ private:
std::shared_ptr<FileManagement::Interface::Dtc> m_flmDtc;
std::shared_ptr<FileManagement::Interface::Ftc> m_flmFtc;
LtsUtils::RequestHelper *m_requestHelper{nullptr};
LOGGER_T m_logger;
};
}
@@ -17,7 +17,6 @@ ExerciseManagementExercisePurpose::ExerciseManagementExercisePurpose(const QStri
, m_menuGroup(menuGroup)
, m_exercise()
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManagementExercisePurpose"))
{
m_ui->setupUi(this);
@@ -19,7 +19,6 @@ ExerciseManagementOperatorEdit::ExerciseManagementOperatorEdit(const QString &me
, m_menuGroup(menuGroup)
, m_exercise()
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManagementOperatorEdit"))
{
m_ui->setupUi(this);
@@ -111,7 +110,7 @@ void ExerciseManagementOperatorEdit::sendModifiedOperators(int thisExerciseId)
std::shared_ptr<OperatorManagement::Interface::Ftc> opmFtc;
if (!m_session->getFtc<OperatorManagement::DataInterface>(opmFtc))
{
ERROR_LOG(m_logger) << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
ERROR_LOG() << "Cannot change add/remove Operators to/from Exercise as the OPM-FTC could not be fetched." ;
return;
}
@@ -24,7 +24,6 @@ ExerciseManagementPhaseEdit::ExerciseManagementPhaseEdit(const QString &menuGrou
, m_menuGroup(menuGroup)
, m_exercise()
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManagementStateEdit"))
{
m_ui->setupUi(this);
@@ -95,7 +94,7 @@ void ExerciseManagementPhaseEdit::onEditExercisePhase()
if (exPhase.id() <= 0)
return;
DEBUG_LOG(m_logger) << "current exPhase Id: " << exPhase.id();
DEBUG_LOG() << "current exPhase Id: " << exPhase.id();
ExerciseManagementPhaseEditDialog *dialog = new ExerciseManagementPhaseEditDialog(this);
@@ -17,7 +17,6 @@ ExercisePhaseModel::ExercisePhaseModel(QObject *parent)
tr("Exercise-Id")},
parent)
, m_exmDtc(nullptr)
, m_logger(getLogger("ExercisePhaseModel"))
{}
@@ -31,7 +30,7 @@ bool ExercisePhaseModel::initModel(int exerciseId, const std::shared_ptr<Exercis
m_exmDtc->exercisePhases([this](const ExercisePhase &item) { insertRow(item); });
INFO_LOG(m_logger) << "initModel - #exercise phases: " << m_vecData.size();
INFO_LOG() << "initModel - #exercise phases: " << m_vecData.size();
return true;
}
@@ -46,9 +46,6 @@ private:
int m_exerciseId{0};
std::shared_ptr<ExerciseManagement::Interface::Dtc> m_exmDtc;
LOGGER_T m_logger;
friend class ExercisePhaseProxyModel;
};
@@ -20,7 +20,6 @@ ExerciseManagementStateEdit::ExerciseManagementStateEdit(const QString &menuGrou
, m_exercise()
, m_currentState(ExerciseState::Unknown)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_logger(getLogger("ExerciseManagementStateEdit"))
{
m_ui->setupUi(this);