lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
+19 -20
View File
@@ -63,19 +63,19 @@ Logger::Logger(LoggerFactory *loggerFactory, QObject *parent)
void Logger::debug(const QString &message)
{
/*DEBUG_LOG*/ERROR_LOG(m_logger) << message;
/*DEBUG_LOG*/ERROR_LOG() << message;
}
void Logger::warning(const QString &message)
{
WARNING_LOG(m_logger) << message;
WARNING_LOG() << message;
}
void Logger::error(const QString &message)
{
ERROR_LOG(m_logger) << message;
ERROR_LOG() << message;
}
@@ -83,11 +83,10 @@ void Logger::error(const QString &message)
ThpScriptServer::ThpScriptServer(QObject *parent)
: AbstractServer(parent)
, mWsSvr(new QWebSocketServer({}, QWebSocketServer::NonSecureMode, this))
, m_logger(getLogger("ThpScriptServer"))
{
if (!listen(NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER)))
{
ERROR_LOG(m_logger) << "cannot listen on port " << NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER);
ERROR_LOG() << "cannot listen on port " << NGL::Connections::port(NGL::Connections::eConnection::FLM_THP_SERVER);
Q_ASSERT(false);
}
@@ -149,7 +148,7 @@ ThpScriptServer::ThpScriptServer(QObject *parent)
default:
{
ERROR_LOG(m_logger) << "ws unknown path: " << cli->requestUrl().path();
ERROR_LOG() << "ws unknown path: " << cli->requestUrl().path();
failed = true;
break;
}
@@ -193,7 +192,7 @@ const QString ThpScriptServer::readContentFile() const
f->deleteLater();
if (!f->open(QIODevice::ReadOnly))
{
WARNING_LOG(m_logger) << "Error opening " << f->fileName() << " for reading: " << f->errorString();
WARNING_LOG() << "Error opening " << f->fileName() << " for reading: " << f->errorString();
return QStringLiteral("[]");
}
@@ -225,7 +224,7 @@ bool ThpScriptServer::newHttpConnection(httq::HttpRequest *request)
}
catch(const DataStreamError &err)
{
DEBUG_LOG(m_logger) << "handler threw DataStreamError: " << err.what();
DEBUG_LOG() << "handler threw DataStreamError: " << err.what();
// do not delete request as a failed datastream deletes it itself
return false;
}
@@ -305,7 +304,7 @@ ThpServerInformation ThpScriptServer::fromJson(const QJsonValue &val)
void ThpScriptServer::errorHandler(httq::HttpRequest *request, const HttpException &e) const
{
DEBUG_LOG(m_logger) << "handler threw error: " << e.error << " (http status = " << e.status << ")";
DEBUG_LOG() << "handler threw error: " << e.error << " (http status = " << e.status << ")";
QJsonObject root;
@@ -326,7 +325,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ
QFile contentFile(thpDirectory() + QStringLiteral("content.json"), this);
if (!contentFile.open(QIODevice::ReadWrite))
{
ERROR_LOG(m_logger) << "Error opening file '" << contentFile.fileName() << "' for read/write: " << contentFile.errorString();
ERROR_LOG() << "Error opening file '" << contentFile.fileName() << "' for read/write: " << contentFile.errorString();
throw(HttpException(QStringLiteral("cannot open content file '%1': %2").arg(contentFile.fileName(), contentFile.errorString())));
}
@@ -341,7 +340,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ
if (err.error != QJsonParseError::NoError)
{
ERROR_LOG(m_logger) << "content file's json invalid at" << err.offset << ":" << err.errorString();
ERROR_LOG() << "content file's json invalid at" << err.offset << ":" << err.errorString();
throw(HttpException(QStringLiteral("content file's json invalid at %1: %2").arg(err.offset).arg(err.errorString())));
}
@@ -369,7 +368,7 @@ void ThpScriptServer::changeList(const ThpServerInformation &tsi, httq::HttpRequ
if (!contentFile.resize(0) || !contentFile.write(QJsonDocument(arr).toJson()))
{
ERROR_LOG(m_logger) << "Error writing content.json: " << contentFile.errorString();
ERROR_LOG() << "Error writing content.json: " << contentFile.errorString();
throw(HttpException(QStringLiteral("error writing content file: %1").arg(contentFile.errorString())));
}
@@ -535,7 +534,7 @@ bool ThpScriptServer::handleRequestSync(httq::HttpRequest &request) noexcept(fal
default:
{
WARNING_LOG(m_logger) << "unsupported method for /thp2";
WARNING_LOG() << "unsupported method for /thp2";
throw HttpException(L("unsupported method for /thp2: %1").arg((int)request.method()), 405);
}
}
@@ -625,7 +624,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
if (!QFile::remove(destFile))
{
const QString err(QStringLiteral("Cannot remove old THP upload file %1 - removing THP not possible").arg(destFile));
ERROR_LOG(m_logger) << err;
ERROR_LOG() << err;
throw(HttpException(err));
}
@@ -664,7 +663,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
if (!QDir().mkpath(destDir))
{
const QString err(QStringLiteral("Cannot create directory %1 - THP upload not possible").arg(destDir));
ERROR_LOG(m_logger) << err;
ERROR_LOG() << err;
throw(HttpException(err));
}
@@ -673,7 +672,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
if (fi.exists() && !QFile::remove(destFile))
{
const QString err(QStringLiteral("Cannot remove old THP upload file %1 - THP upload not possible").arg(destDir));
ERROR_LOG(m_logger) << err;
ERROR_LOG() << err;
throw(HttpException(err));
}
@@ -702,7 +701,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
if (!d.exists() && !d.mkpath(destDir))
{
const QString errstr(QStringLiteral("Can create directory '%1' - THP upload not possible").arg(destDir));
ERROR_LOG(m_logger) << errstr;
ERROR_LOG() << errstr;
throw(HttpException(errstr));
}
@@ -711,7 +710,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
if (fi.exists() && !QFile::remove(destFile))
{
const QString errstr(QStringLiteral("Can not remove old file '%1'").arg(destDir));
ERROR_LOG(m_logger) << errstr;
ERROR_LOG() << errstr;
throw(HttpException(errstr));
}
@@ -720,7 +719,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
if (!f->rename(destFile))
{
const QString errstr(QStringLiteral("Can not rename %1 to %2: %3").arg(tmpFilename, destFile, f->errorString()));
ERROR_LOG(m_logger) << errstr;
ERROR_LOG() << errstr;
throw(HttpException(errstr));
}
@@ -744,7 +743,7 @@ bool ThpScriptServer::handleRequest(httq::HttpRequest *request) noexcept(false)
default:
{
WARNING_LOG(m_logger) << "unsupported method";
WARNING_LOG() << "unsupported method";
throw(HttpException(QStringLiteral("unsupported method"), 405));
}
}