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

@@ -41,7 +41,6 @@ ParticipantEdit::ParticipantEdit(LtsSession::LtsSession *session, bool asSupport
, m_pbTreeViewDummy(new QPushButton(m_pbTreeView->text()))
, m_pbTableViewDummy(new QPushButton(m_pbTableView->text()))
, m_ui(new Ui::ParticipantEdit)
, m_logger(getLogger("ParticipantEdit"))
{
m_ui->setupUi(this);
@@ -235,17 +234,17 @@ void ParticipantEdit::showIsSimulated()
void ParticipantEdit::lock()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
DEBUG_LOG() << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
}
void ParticipantEdit::unlock()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
DEBUG_LOG() << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
}
void ParticipantEdit::onPartyChanged()
@@ -321,7 +320,7 @@ void ParticipantEdit::onEnaDisa()
{
if (m_dtc->isAdlerVerbund(m_pTreehandler->getSelectedData().typeId()))
{
DEBUG_LOG(m_logger) << "Can't Edit Adler SAA Participants";
DEBUG_LOG() << "Can't Edit Adler SAA Participants";
enableEdit = true;
}
else
@@ -118,7 +118,6 @@ private:
FiringUnitValidator *m_firingUnitValidator{nullptr};
Ui::ParticipantEdit *m_ui;
NGL::INGLLogger &m_logger;
};
}
@@ -38,7 +38,6 @@ ParticipantOrganisationDialog::ParticipantOrganisationDialog(LtsSession::LtsSess
, m_session(session)
, m_requestHelper(new LtsUtils::RequestHelper(this))
, m_ui(new Ui::ParticipantOrganisation)
, m_logger(getLogger("ParticipantOrganisation"))
{
m_ui->setupUi(this);
m_ui->splitter->setStretchFactor(0, 1);
@@ -79,7 +78,7 @@ void ParticipantOrganisationDialog::retranslate()
void ParticipantOrganisationDialog::lock()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
DEBUG_LOG() << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
@@ -91,12 +90,12 @@ void ParticipantOrganisationDialog::lock()
m_ui->tvDetached->setEnabled(false);
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
}
void ParticipantOrganisationDialog::unlock()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START";
DEBUG_LOG() << Q_FUNC_INFO << " START";
m_ui->cbParty->setEnabled(true);
@@ -104,7 +103,7 @@ void ParticipantOrganisationDialog::unlock()
m_ui->tvAttached->setEnabled(true);
m_ui->tvCooperate->setEnabled(true);
m_ui->tvDetached->setEnabled(true);
DEBUG_LOG(m_logger) << LOGFUNCTION << " END";
DEBUG_LOG() << Q_FUNC_INFO << " END";
}
bool ParticipantOrganisationDialog::init(const std::shared_ptr<ParticipantManagement::Interface::Dtc> &dtc,
@@ -357,7 +356,7 @@ void ParticipantOrganisationDialog::onPartyChanged()
s_preselectedParty = curPartyId;
DEBUG_LOG(m_logger) << LOGFUNCTION << " START, curPartyId" << curPartyId
DEBUG_LOG() << Q_FUNC_INFO << " START, curPartyId" << curPartyId
<< ", m_asSupportService=" << m_asSupportService;
@@ -105,7 +105,6 @@ private:
static int s_preselectedParty;
Ui::ParticipantOrganisation *m_ui;
NGL::INGLLogger &m_logger;
};
@@ -28,7 +28,6 @@ ParticipantPoolModel::ParticipantPoolModel(QObject *parent,
, AdvancedSymbology::TableModelSymbolRenderer<ParticipantPoolModel>(ColDesignatorIdentifier)
, m_asSupportService(asSupportService)
, m_dtc(dtc)
, m_logger(getLogger("ParticipantPoolModel"))
{
std::shared_ptr<AdvancedSymbology::ForeignDataInterface> asb;
@@ -154,7 +153,7 @@ bool ParticipantPoolModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
if (action != Qt::CopyAction && action != Qt::MoveAction)
return false;
DEBUG_LOG(m_logger) << "dropMimeData: " << data->formats().join(QLatin1Char(','));
DEBUG_LOG() << "dropMimeData: " << data->formats().join(QLatin1Char(','));
if (!data->hasFormat(ParticipantTemplateRoot) &&
!data->hasFormat(ParticipantPartyRoot) &&
@@ -251,7 +250,7 @@ void ParticipantPoolModel::onParticipantDataChanged(const Participant &data, Dat
const ParticipantData &part = m_vecData.at(i);
if (part.id() == data.id())
{
DEBUG_LOG(m_logger) << "Modifed participant " << data.id() << ", old party: " << part.partyId() << ", new: " << data.partyId();
DEBUG_LOG() << "Modifed participant " << data.id() << ", old party: " << part.partyId() << ", new: " << data.partyId();
if (data.partyId() != poolPartyId())
{
@@ -302,7 +301,7 @@ void ParticipantPoolModel::onParticipantOrganisationChanged(const ParticipantOrg
bool ParticipantPoolModel::moveFromPartyToPool(int rootParticipantId, const QString &mimeType)
{
ERROR_LOG(m_logger) << "Moving participant " << rootParticipantId << " from party to root with mime type " << mimeType;
ERROR_LOG() << "Moving participant " << rootParticipantId << " from party to root with mime type " << mimeType;
const Participant part = m_dtc->participant(rootParticipantId);
const QVector<Participant> newParticipants = getSuperiorParticipants(part.id());
@@ -401,7 +400,7 @@ void ParticipantPoolModel::tryRemoveParticipantFromModel(int participantId)
const ParticipantData &part = m_vecData.at(i);
if (part.id() == participantId)
{
DEBUG_LOG(m_logger) << "Removing participant " << participantId;
DEBUG_LOG() << "Removing participant " << participantId;
LtsWidgets::LtsAbstractTableModel<ParticipantManagement::ParticipantData>::removeRow(i);
break;
@@ -79,9 +79,6 @@ private:
QVector<ParticipantData> m_dataToDelete;
QHash<int, ParticipantOrganisation> m_participantOrganization;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
NGL::INGLLogger &m_logger;
};
}
@@ -14,7 +14,6 @@ ParticipantUnitNamer::ParticipantUnitNamer(const QString &designator, const QStr
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
, m_ui(new Ui::ParticipantUnitNamer)
, m_validator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[^,;\"'´`]*")), this))
, m_logger(getLogger("ParticipantTemplateChooser"))
{
m_ui->setupUi(this);
@@ -30,7 +30,6 @@ Q_SIGNALS:
private:
Ui::ParticipantUnitNamer *m_ui;
QValidator *m_validator;
LOGGER_T m_logger;
};
}
@@ -28,7 +28,6 @@ TacticalOrganisation::TacticalOrganisation(LtsSession::LtsSession *session, QWid
, m_tvContextMenu(nullptr)
, m_newItemDlg(nullptr)
, m_ui(new Ui::TacticalOrganisation)
, m_logger(getLogger("TacticalOrganisation"))
{
m_ui->setupUi(this);
connect(m_addEquipmentNumberAction, &QAction::triggered,
@@ -64,7 +63,7 @@ bool TacticalOrganisation::init(const std::shared_ptr<ParticipantManagement::Int
if (!m_session->createTopicClient<Core::Interface::Ftc>(m_coreFtc))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " create coreFtc failed";
ERROR_LOG() << Q_FUNC_INFO << " create coreFtc failed";
return false;
}
@@ -151,7 +150,7 @@ void TacticalOrganisation::onReinitLeft()
s_preselectedPartyLeft = partyId;
auto *model = modelForParty(partyId, true);
INFO_LOG(m_logger) << "Set model left: " << model;
INFO_LOG() << "Set model left: " << model;
m_ui->dvPartyLeft->setModel(model);
#ifndef LTS_DEBUG
m_ui->dvPartyLeft->setColumnHidden(ParticipantEditModel::ColParticipantId, true);
@@ -165,7 +164,7 @@ void TacticalOrganisation::onReinitRight()
s_preselectedPartyRight = partyId;
auto *model = modelForParty(partyId, false);
INFO_LOG(m_logger) << "Set model right: " << model;
INFO_LOG() << "Set model right: " << model;
m_ui->dvPartyRight->setModel(model);
#ifndef LTS_DEBUG
m_ui->dvPartyRight->setColumnHidden(ParticipantEditModel::ColParticipantId, true);
@@ -90,6 +90,5 @@ private:
int32_t m_unlockId {0};
Ui::TacticalOrganisation *m_ui;
NGL::INGLLogger &m_logger;
};
}