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

@@ -21,7 +21,6 @@ SaaChooser::SaaChooser(QWidget *parent)
, m_close(false)
, m_selected(false)
, m_pingTimer(new QTimer(this))
, m_logger(getLogger("SaaChooser"))
{
m_ui->setupUi(this);
m_pingTimer->setInterval(15000);
@@ -104,7 +103,7 @@ QString SaaChooser::rdesktopCodeToString(RdesktopCodes code)
SaaChooser::RdesktopCodes SaaChooser::getRdesktopInterpretation(int code) const
{
DEBUG_LOG(m_logger)<<">> getRdesktopInterpretation: rdesktop error code: "<<code;
DEBUG_LOG()<<">> getRdesktopInterpretation: rdesktop error code: "<<code;
switch (code)
{
case 0:
@@ -130,7 +129,7 @@ SaaChooser::RdesktopCodes SaaChooser::getRdesktopInterpretation(int code) const
bool SaaChooser::normalExit(int code) const
{
DEBUG_LOG(m_logger)<<">> process finished!! exitCode: "<<code;
DEBUG_LOG()<<">> process finished!! exitCode: "<<code;
return getRdesktopInterpretation(code) == RdesktopCodes::Normal;
}
@@ -176,7 +175,7 @@ void SaaChooser::slotSelectSaa()
{
if (process != qobject_cast<QProcess *>(sender()) || process.isNull())
return;
ERROR_LOG(m_logger) << ">> SAA Remote desktop: error:" << process->readAllStandardError();
ERROR_LOG() << ">> SAA Remote desktop: error:" << process->readAllStandardError();
});
@@ -185,7 +184,7 @@ void SaaChooser::slotSelectSaa()
{
if (process != qobject_cast<QProcess *>(sender()) || process.isNull())
return;
INFO_LOG(m_logger) << ">> SAA Remote desktop: " << process->readAllStandardOutput();
INFO_LOG() << ">> SAA Remote desktop: " << process->readAllStandardOutput();
});
@@ -197,7 +196,7 @@ void SaaChooser::slotSelectSaa()
if (process->state() != QProcess::Running)
LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
WARNING_LOG()<<">> saa with id ("<<asset.id()<<")"<<" started ";
});
@@ -205,7 +204,7 @@ void SaaChooser::slotSelectSaa()
connect(process, &QProcess::started,
this, [this, asset]()
{
WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
WARNING_LOG()<<">> saa with id ("<<asset.id()<<")"<<" started ";
LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
@@ -220,11 +219,11 @@ void SaaChooser::slotSelectSaa()
<< QStringLiteral("-p")<< assetProps.password
<< saaIp;
DEBUG_LOG(m_logger)<<">> Process rdesktop: "<<args.join(QStringLiteral(" "));
DEBUG_LOG()<<">> Process rdesktop: "<<args.join(QStringLiteral(" "));
process->start(program, args);
if (!process->waitForStarted())
{
ERROR_LOG(m_logger) << "Could not start saa process "<<process->program() <<" " << process->arguments().join(QStringLiteral(" "));
ERROR_LOG() << "Could not start saa process "<<process->program() <<" " << process->arguments().join(QStringLiteral(" "));
process->deleteLater();
}
}
@@ -71,7 +71,6 @@ private:
bool m_selected;
QTimer *m_pingTimer;
LOGGER_T m_logger;
};
}
@@ -16,32 +16,31 @@ using namespace SAAUtils;
SaaDialogModel::SaaDialogModel(QObject *parent)
: LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>({tr("Id"), tr("Name"), tr("scenario is running"), tr("Used by Party")}, parent)
, m_ppmDtc(nullptr)
, m_logger(getLogger("SaaDialogModel"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
SaaDialogModel::~SaaDialogModel()
{
stopPing();
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
m_session = session;
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
{
ERROR_LOG(m_logger) << " ppmDtc not set!!! " << m_logger.getLoggerName();
ERROR_LOG() << " ppmDtc not set!!! " << m_logger.getLoggerName();
return false;
}
if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
{
ERROR_LOG(m_logger) << " asmDtc not set!!! " << m_logger.getLoggerName();
ERROR_LOG() << " asmDtc not set!!! " << m_logger.getLoggerName();
return false;
}
@@ -68,13 +67,13 @@ bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
onDataChanged(asset, DataModification::eAdded);
});
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
return true;
}
void SaaDialogModel::pingAllSaa()
{
DEBUG_LOG(m_logger) << "====> pingAllSaa: saaList count: " << m_saaPingItems.count();
DEBUG_LOG() << "====> pingAllSaa: saaList count: " << m_saaPingItems.count();
if (m_saaPingItems.isEmpty())
return;
@@ -99,7 +98,7 @@ void SaaDialogModel::pingAllSaa()
{
ParticipantManagement::Party party;
getPartyWithAssetId(pi.assetId, party);
DEBUG_LOG(m_logger) << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id() > 0) << " Ip: " << pi.host
DEBUG_LOG() << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id() > 0) << " Ip: " << pi.host
<< " PortNumb: " << pi.port;
pi.reachable = (exitCode == 0);
pi.process->kill();
@@ -123,13 +122,13 @@ void SaaDialogModel::saaConnected(int assetId, bool state)
void SaaDialogModel::stopPing()
{
WARNING_LOG(m_logger) << ">> stop ping saa...";
WARNING_LOG() << ">> stop ping saa...";
for (auto &pi : m_saaPingItems)
{
if (pi.process)
{
WARNING_LOG(m_logger) << ">> kill process saaId: " << pi.assetId;
WARNING_LOG() << ">> kill process saaId: " << pi.assetId;
pi.process->kill();
pi.process->deleteLater();
pi.process = nullptr;
@@ -147,7 +146,7 @@ void SaaDialogModel::updateView()
void SaaDialogModel::onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType)
{
Q_UNUSED(modType)
DEBUG_LOG(m_logger) << ">>> SAA Dialog Party Data Changed: " << data.id() << " properties: " << data.properties();
DEBUG_LOG() << ">>> SAA Dialog Party Data Changed: " << data.id() << " properties: " << data.properties();
update();
}
@@ -55,7 +55,6 @@ private:
std::shared_ptr<AssetManagement::Interface::Dtc> m_asmDtc;
QHash<int, PingItem> m_saaPingItems;
LtsSession::LtsSession *m_session{nullptr};
LOGGER_T m_logger;
};
}