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
+10
-11
@@ -20,16 +20,15 @@ PdfDownloadSocket::PdfDownloadSocket(const QString &hostName, QObject *parent)
|
||||
, m_socket(new QTcpSocket(this))
|
||||
, m_readTimeout(new QTimer(this))
|
||||
, m_sizeToDownload(0)
|
||||
, m_logger(getLogger("PdfDownloadSocket"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PdfDownloadSocket::PdfDownloadSocket";
|
||||
DEBUG_LOG() << "PdfDownloadSocket::PdfDownloadSocket";
|
||||
connect(m_socket, &QTcpSocket::connected, this, &PdfDownloadSocket::connected);
|
||||
connect(m_socket, &QTcpSocket::readyRead, this, &PdfDownloadSocket::readyRead);
|
||||
unsigned short port = NGL::Connections::port(NGL::Connections::eConnection::FLM_PDF_SERVER);
|
||||
m_socket->connectToHost(hostName, port);
|
||||
m_socket->waitForConnected();
|
||||
|
||||
DEBUG_LOG(m_logger) << "hostname " << hostName << " port " << port;
|
||||
DEBUG_LOG() << "hostname " << hostName << " port " << port;
|
||||
|
||||
m_readTimeout->setInterval(10000);
|
||||
m_readTimeout->setSingleShot(false);
|
||||
@@ -38,23 +37,23 @@ PdfDownloadSocket::PdfDownloadSocket(const QString &hostName, QObject *parent)
|
||||
|
||||
PdfDownloadSocket::~PdfDownloadSocket()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "~PdfDownloadSocket";
|
||||
DEBUG_LOG() << "~PdfDownloadSocket";
|
||||
m_socket->close();
|
||||
}
|
||||
|
||||
void PdfDownloadSocket::readyRead()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "reading...";
|
||||
DEBUG_LOG() << "reading...";
|
||||
m_readTimeout->stop();
|
||||
|
||||
m_downloadedData.append(m_socket->readAll());
|
||||
|
||||
DEBUG_LOG(m_logger) << m_downloadedData.size() << " of " << m_sizeToDownload << " bytes downloaded";
|
||||
DEBUG_LOG() << m_downloadedData.size() << " of " << m_sizeToDownload << " bytes downloaded";
|
||||
|
||||
if (m_downloadedData.size() >= m_sizeToDownload)
|
||||
{
|
||||
m_sizeToDownload = 0;
|
||||
DEBUG_LOG(m_logger) << "Download finished";
|
||||
DEBUG_LOG() << "Download finished";
|
||||
emit downloadFinished(m_downloadedData);
|
||||
}
|
||||
else
|
||||
@@ -63,17 +62,17 @@ void PdfDownloadSocket::readyRead()
|
||||
|
||||
void PdfDownloadSocket::connected()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "connected...";
|
||||
DEBUG_LOG() << "connected...";
|
||||
}
|
||||
|
||||
void PdfDownloadSocket::onReadTimeout()
|
||||
{
|
||||
//check for filesize
|
||||
m_readTimeout->stop();
|
||||
DEBUG_LOG(m_logger) << "TimerEnd" << m_downloadedData.size() << " expected " << m_sizeToDownload;
|
||||
DEBUG_LOG() << "TimerEnd" << m_downloadedData.size() << " expected " << m_sizeToDownload;
|
||||
|
||||
if (m_downloadedData.size() < m_sizeToDownload)
|
||||
WARNING_LOG(m_logger) << "not enough data: got " << m_downloadedData.size() << " expected " << m_sizeToDownload;
|
||||
WARNING_LOG() << "not enough data: got " << m_downloadedData.size() << " expected " << m_sizeToDownload;
|
||||
|
||||
emit downloadFinished(m_downloadedData);
|
||||
}
|
||||
@@ -90,7 +89,7 @@ void PdfDownloadSocket::downloadFromHost(const int fileId, const qint64 fileSize
|
||||
m_socket->readAll();
|
||||
|
||||
int writeHeaderSize = m_socket->write(cmd);
|
||||
DEBUG_LOG(m_logger) << "writeHeaderSize = " << writeHeaderSize;
|
||||
DEBUG_LOG() << "writeHeaderSize = " << writeHeaderSize;
|
||||
m_readTimeout->start();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user