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 @@ PdfDownloader::PdfDownloader(const QVector<WebSocketInterface::Messages::PdfList
, m_exTblGen(new DBAdministration::ExerciseTableGenerator(getLogger("ExerciseTableGenerator"), NGL::directory(NGL::FileType::ConfigFile, QLatin1String("xml")), this))
, m_downloadCount(0)
, m_totalDownloads(pdfInfoVec.size())
, m_logger(getLogger("PdfDownloader"))
{
connect(m_socket, &PdfDownloadSocket::downloadFinished,
this, &PdfDownloader::onSingleDownloadFinished);
@@ -43,17 +42,17 @@ PdfDownloader::~PdfDownloader()
bool PdfDownloader::startDownload()
{
DEBUG_LOG(m_logger) << "Downloading startet";
DEBUG_LOG() << "Downloading startet";
if (!m_socket->isConnected())
{
ERROR_LOG(m_logger) << "Download could not be startet. Socket not connected.";
ERROR_LOG() << "Download could not be startet. Socket not connected.";
return false;
}
if (!openDbConnection())
{
ERROR_LOG(m_logger) << "Could not open database connection";
ERROR_LOG() << "Could not open database connection";
return false;
}
@@ -62,24 +61,24 @@ bool PdfDownloader::startDownload()
void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
{
DEBUG_LOG(m_logger) << "Downloading file " << m_currentDownload.name << " finished.";
DEBUG_LOG() << "Downloading file " << m_currentDownload.name << " finished.";
++m_downloadCount;
if (!data.size())
WARNING_LOG(m_logger) << "Got finished download without data";
WARNING_LOG() << "Got finished download without data";
QString msg = QString::fromUtf8(data);
if (msg.startsWith(QStringLiteral("ERROR")))
{
ERROR_LOG(m_logger) << msg;
ERROR_LOG() << msg;
startNextDownload();
return;
}
if (!m_dbConnection.isValid())
{
ERROR_LOG(m_logger) << "Database not open";
ERROR_LOG() << "Database not open";
return;
}
@@ -87,7 +86,7 @@ void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
if (!flmDbHandler->init(0, m_dbConnection))
{
ERROR_LOG(m_logger) << "Couldn't initialise flmDbHandler";
ERROR_LOG() << "Couldn't initialise flmDbHandler";
return;
}
@@ -111,7 +110,7 @@ void PdfDownloader::onSingleDownloadFinished(const QByteArray &data)
flmDbHandler->db()->insert(dbData);
if (!trans.commit())
ERROR_LOG(m_logger) << "Error while inserting FLM data into database.";
ERROR_LOG() << "Error while inserting FLM data into database.";
startNextDownload();
}
@@ -120,7 +119,7 @@ bool PdfDownloader::startNextDownload()
{
if (m_pdfInfoVec.isEmpty())
{
DEBUG_LOG(m_logger) << "No more pending downloads.";
DEBUG_LOG() << "No more pending downloads.";
closeDb(m_dbConnection);
emit allDownloadsFinished();
@@ -132,7 +131,7 @@ bool PdfDownloader::startNextDownload()
emit newState(100 / m_totalDownloads * m_downloadCount, tr("Downloading file \"%1\"").arg(m_currentDownload.name));
DEBUG_LOG(m_logger) << "Downloading file " << m_currentDownload.name;
DEBUG_LOG() << "Downloading file " << m_currentDownload.name;
m_socket->downloadFromHost(m_currentDownload.id, m_currentDownload.fileSize);
@@ -169,10 +168,10 @@ QSqlDatabase PdfDownloader::openDb(bool *bOk)
s->databaseDriver(),
s->databaseHostname(),
s->databaseName());
DEBUG_LOG(m_logger) << "Trying to open database " << s->databaseHostname() << ":" << s->databaseName();
DEBUG_LOG() << "Trying to open database " << s->databaseHostname() << ":" << s->databaseName();
if (!dbConnection.isOpen())
{
ERROR_LOG(m_logger) << "Error opening database " << s->databaseHostname() << ":" << s->databaseName();
ERROR_LOG() << "Error opening database " << s->databaseHostname() << ":" << s->databaseName();
if (bOk)
*bOk = false;
}
@@ -183,7 +182,7 @@ void PdfDownloader::closeDb(QSqlDatabase &dbConn)
{
const QString connName = dbConn.connectionName();
DEBUG_LOG(m_logger) << "Closing database: " << connName;
DEBUG_LOG() << "Closing database: " << connName;
dbConn.close();
dbConn = QSqlDatabase();