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

@@ -63,7 +63,7 @@ WARNING_LOG(x)
#endif
#ifndef ELOG
#define ELOG ERROR_LOG(m_logger)
#define ELOG ERROR_LOG()
#endif
@@ -80,15 +80,11 @@ USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
, m_usbThpModel(new ExportedScriptsModel(this))
, m_ui(new Ui::USB2Dialog)
, m_session(session)
, m_logger(getLogger("USB2Dialog"))
{
m_ui->setupUi(this);
WARNING_LOG(m_logger)<<" USB2Dialog::USB2Dialog() START ";
WARNING_LOG()<<" USB2Dialog::USB2Dialog() START ";
connect(m_ui->pbCHange, &QPushButton::clicked,
this, &USB2Dialog::slotChangePath);
@@ -139,13 +135,13 @@ USB2Dialog::USB2Dialog(LtsSession::LtsSession *session, QWidget *parent)
}
catch(...)
{
WARNING_LOG(m_logger)<<" data corrupted path: "<< localThpDir();
WARNING_LOG()<<" data corrupted path: "<< localThpDir();
new LtsWidgets::LtsMessageDialogNew(this, tr("Couldn't Load THP(s)"));
}
setOnlineHelpFilename(QStringLiteral("Script_Editor-Export_Script_Administration"));
WARNING_LOG(m_logger)<<" USB2Dialog::USB2Dialog() END ";
WARNING_LOG()<<" USB2Dialog::USB2Dialog() END ";
}
@@ -189,15 +185,15 @@ void USB2Dialog::unmountUSB(const QString &device)
while (process.canReadLine())
{
QString outputLine = QString::fromUtf8(process.readLine());
DEBUG_LOG(m_logger) << "OutputLine: " << outputLine;
DEBUG_LOG() << "OutputLine: " << outputLine;
auto outputDevicePath = outputLine.split(QStringLiteral(" ")).last();
DEBUG_LOG(m_logger) << "OutputDevicePath: " << outputDevicePath;
DEBUG_LOG() << "OutputDevicePath: " << outputDevicePath;
auto outputPathStripped = outputDevicePath.replace(QLatin1String("\\x20"), QLatin1String(" "));
DEBUG_LOG(m_logger) << "OutputPathStripped: " << outputPathStripped;
DEBUG_LOG() << "OutputPathStripped: " << outputPathStripped;
auto outputDeviceName = outputPathStripped.split(QStringLiteral("/")).last();
DEBUG_LOG(m_logger) << "OutputDeviceName: " << outputDeviceName;
DEBUG_LOG() << "OutputDeviceName: " << outputDeviceName;
if (outputDeviceName.trimmed().compare(device.trimmed()) == 0)
{
@@ -205,7 +201,7 @@ void USB2Dialog::unmountUSB(const QString &device)
auto serialPort = outputLine.split(QStringLiteral(" ")).first();
QString absPath = QStringLiteral("/dev/") + serialPort;
DEBUG_LOG(m_logger) << "Serial Port: " << absPath;
DEBUG_LOG() << "Serial Port: " << absPath;
process.start(QStringLiteral("udisksctl"), QStringList() << QStringLiteral("unmount") << QStringLiteral("-b") << absPath);
process.waitForFinished();
reset();
@@ -332,7 +328,7 @@ void USB2Dialog::slotUnmount()
for(const auto &folder : std::as_const(folderNames))
{
DEBUG_LOG(m_logger) << "Folder: " << folder << " USB Root: " << m_usbRoot;
DEBUG_LOG() << "Folder: " << folder << " USB Root: " << m_usbRoot;
if(m_usbRoot.contains(folder))
{
@@ -483,7 +479,7 @@ void USB2Dialog::slotRemove()
if (mil.size() < 1)
return;
DEBUG_LOG(m_logger) << "mil.size()" << mil.size();
DEBUG_LOG() << "mil.size()" << mil.size();
QStringList scriptIdList;
for (const QModelIndex &idx : mil)
@@ -608,7 +604,7 @@ void USB2Dialog::retranslate()
void USB2Dialog::initLocalModel() noexcept(false)
{
DEBUG_LOG(m_logger) << "(re)initModel !!";
DEBUG_LOG() << "(re)initModel !!";
@@ -68,6 +68,5 @@ private:
QMap<QString, QFileInfoList> m_files;
QString m_usbRoot;
NGL::INGLLogger &m_logger;
};
}