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:
2785 files changed
+18754
-18316
No files matched your search
@@ -18,21 +18,20 @@ namespace FileManagement
|
||||
|
||||
CBI_PdfDownload::CBI_PdfDownload(unsigned short port)
|
||||
: CommandInterface(port, "PDF_DOWNLOAD")
|
||||
, m_logger(getLogger("PdfDownload"))
|
||||
{}
|
||||
|
||||
void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
|
||||
{
|
||||
setAutoWriteEOL(false);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got command for PDF download";
|
||||
DEBUG_LOG() << "Got command for PDF download";
|
||||
|
||||
if (args.count() != 1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid arg count";
|
||||
ERROR_LOG() << "Invalid arg count";
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Argument count ok";
|
||||
DEBUG_LOG() << "Argument count ok";
|
||||
|
||||
bool bOk;
|
||||
int documentId = args.at(0).toInt(&bOk);
|
||||
@@ -41,10 +40,10 @@ void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
|
||||
{
|
||||
const QString err(QStringLiteral("Invalid file id: '%1'").arg(QString::fromUtf8(args.at(0))));
|
||||
writeError(err);
|
||||
ERROR_LOG(m_logger) << err;
|
||||
ERROR_LOG() << err;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Argument ok";
|
||||
DEBUG_LOG() << "Argument ok";
|
||||
|
||||
MainHandler *mainHandler = static_cast<MainHandler *>(TcpServer::instance(port())->userData());
|
||||
|
||||
@@ -55,22 +54,22 @@ void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
|
||||
{
|
||||
const QString err(QStringLiteral("File with ID '%1' does not exist").arg(QString::fromUtf8(args.at(0))));
|
||||
writeError(err);
|
||||
ERROR_LOG(m_logger) << err;
|
||||
ERROR_LOG() << err;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "File ID valid";
|
||||
DEBUG_LOG() << "File ID valid";
|
||||
|
||||
if (fileContent.fileTypeId != FileManagement::FileType::Pdf)
|
||||
{
|
||||
const QString err(QStringLiteral("File with ID '%1' is not of type Pdf").arg(QString::fromUtf8(args.at(0))));
|
||||
writeError(err);
|
||||
ERROR_LOG(m_logger) << err;
|
||||
ERROR_LOG() << err;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "FileType valid";
|
||||
DEBUG_LOG() << "FileType valid";
|
||||
|
||||
// success
|
||||
DEBUG_LOG(m_logger) << "File ok, sending file \"" << fileContent.name << "\" with ID " << fileContent.id;
|
||||
DEBUG_LOG() << "File ok, sending file \"" << fileContent.name << "\" with ID " << fileContent.id;
|
||||
writeData(fileContent.content);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user