From b96dec41e4c4dc0105ead52fd1375a7d893d6779 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Fri, 18 Sep 2026 17:47:34 +0200 Subject: [PATCH] Fixes enum casts and CorePortType in flm service glue --- .../WebSocketInterface/data_manager.cpp | 12 ++-- .../FileManagement/convert_db_to_dds.h | 64 +++++++++---------- .../Services/FileManagement/main_handler.cpp | 2 +- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/data_manager.cpp index b05518e1e..566d8679c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/data_manager.cpp @@ -62,9 +62,11 @@ LtsWebSocket::ReplyMessage *DataManager::fileContentBaseData(const QString &uuid data.name = query->value(i++).toString(); data.isTemplate = query->value(i++).toBool(); data.folderId = query->value(i++).toLongLong(); - data.fileCategoryId = static_cast(query->value(i++).toInt()); - data.fileTypeId = static_cast(query->value(i++).toInt()); - data.fileStatusId = static_cast(query->value(i++).toInt()); + // rtiddsgen 7.7 no longer generates the *_def::type wrappers - + // the enums are directly usable in namespace FileManagement. + data.fileCategoryId = static_cast(query->value(i++).toInt()); + data.fileTypeId = static_cast(query->value(i++).toInt()); + data.fileStatusId = static_cast(query->value(i++).toInt()); data.exerciseId = query->value(i++); data.phaseId = query->value(i++); data.operatorId = query->value(i++).toInt(); @@ -159,10 +161,10 @@ LtsWebSocket::ReplyMessage *DataManager::pdfList(const QString &uuid, int exerci QJsonObject obj({{JsonKeys::NAME(), current.name}, {JsonKeys::FILE_ID(), current.id}, {JsonKeys::FILE_SIZE(), current.content.size()}, - {JsonKeys::FILE_CATEGORY(), current.fileCategoryId.underlying()}, + {JsonKeys::FILE_CATEGORY(), static_cast(current.fileCategoryId)}, {JsonKeys::IS_TEMPLATE(), current.isTemplate}, {JsonKeys::PROPERTIES(), current.properties}, - {JsonKeys::FILE_STATUS(), current.fileStatusId.underlying() }, + {JsonKeys::FILE_STATUS(), static_cast(current.fileStatusId) }, {JsonKeys::FOLDER_ID(), current.folderId }, {JsonKeys::PHASE_ID(), current.phaseId.toInt() }, {JsonKeys::OPERATOR_ID(), current.operatorId}, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h index fa2730187..a19ec9187 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/convert_db_to_dds.h @@ -20,28 +20,28 @@ inline FileContent convert(const FlmFileContent &dbData) { FileContent ddsData; - ddsData.id(dbData.id); - ddsData.name(dbData.name.toStdString()); - ddsData.isTemplate(dbData.isTemplate); - ddsData.isHidden(dbData.isHidden); - ddsData.fileCategory(dbData.fileCategoryId); - ddsData.folderId(dbData.folderId); - ddsData.fileType(dbData.fileTypeId); - ddsData.operatorId(dbData.operatorId); + ddsData.id = dbData.id; + ddsData.name = dbData.name.toStdString(); + ddsData.isTemplate = dbData.isTemplate; + ddsData.isHidden = dbData.isHidden; + ddsData.fileCategory = dbData.fileCategoryId; + ddsData.folderId = dbData.folderId; + ddsData.fileType = dbData.fileTypeId; + ddsData.operatorId = dbData.operatorId; if (!dbData.exerciseId.isNull() && dbData.exerciseId.canConvert()) - ddsData.exerciseId(dbData.exerciseId.toInt()); + ddsData.exerciseId = dbData.exerciseId.toInt(); if (!dbData.phaseId.isNull() && dbData.phaseId.canConvert()) - ddsData.phaseId(dbData.phaseId.toInt()); - ddsData.fileStatus(dbData.fileStatusId); - ddsData.isUsedBy(dbData.isUsedBy); - ddsData.usedBy(dbData.usedBy); + ddsData.phaseId = dbData.phaseId.toInt(); + ddsData.fileStatus = dbData.fileStatusId; + ddsData.isUsedBy = dbData.isUsedBy; + ddsData.usedBy = dbData.usedBy; if (!dbData.properties.isEmpty()) - ddsData.properties(dbData.properties.toStdString()); - ddsData.lastModified(dbData.lastModified); + ddsData.properties = dbData.properties.toStdString(); + ddsData.lastModified = dbData.lastModified; // init data not in db - ddsData.isDeleted(false); - ddsData.isUsed(false); + ddsData.isDeleted = false; + ddsData.isUsed = false; return ddsData; } @@ -50,13 +50,13 @@ inline FileTypeInfo convert(const FlmFileTypeInfo &dbData) { FileTypeInfo ddsData; - ddsData.id(dbData.id); - ddsData.description(dbData.description.toStdString()); - ddsData.extension(dbData.extension.toStdString()); + ddsData.id = dbData.id; + ddsData.description = dbData.description.toStdString(); + ddsData.extension = dbData.extension.toStdString(); // init data not in db - ddsData.isDeleted(false); - ddsData.isUsed(false); + ddsData.isDeleted = false; + ddsData.isUsed = false; return ddsData; } @@ -65,18 +65,18 @@ inline Folder convert(const FlmFolder &dbData) { Folder ddsData; - ddsData.id(dbData.id); - ddsData.name(dbData.name.toStdString()); - ddsData.path(dbData.path()); - ddsData.isEditable(dbData.isEditable); - ddsData.isHidden(dbData.isHidden); - ddsData.operatorId(dbData.operatorId); - ddsData.parentId(dbData.parentId); - ddsData.lastModified(dbData.lastModified); + ddsData.id = dbData.id; + ddsData.name = dbData.name.toStdString(); + ddsData.path = dbData.path(); + ddsData.isEditable = dbData.isEditable; + ddsData.isHidden = dbData.isHidden; + ddsData.operatorId = dbData.operatorId; + ddsData.parentId = dbData.parentId; + ddsData.lastModified = dbData.lastModified; // init data not in db - ddsData.isDeleted(false); - ddsData.isUsed(false); + ddsData.isDeleted = false; + ddsData.isUsed = false; return ddsData; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp index 1b8cb8f52..ac0ce4c7e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp @@ -131,7 +131,7 @@ bool MainHandler::initFlmHandler() ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed."; return false; } - m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer); + m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer); DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful.";