Fixes enum casts and CorePortType in flm service glue
This commit is contained in:
1 parent
3c058facd7
commit
b96dec41e4
3 files changed
+40
-38
No files matched your search
+7
-5
@@ -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<FileManagement::FileCategory_def::type>(query->value(i++).toInt());
|
||||
data.fileTypeId = static_cast<FileManagement::FileType_def::type>(query->value(i++).toInt());
|
||||
data.fileStatusId = static_cast<FileManagement::FileStatus_def::type>(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<FileManagement::FileCategory>(query->value(i++).toInt());
|
||||
data.fileTypeId = static_cast<FileManagement::FileType>(query->value(i++).toInt());
|
||||
data.fileStatusId = static_cast<FileManagement::FileStatus>(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<int>(current.fileCategoryId)},
|
||||
{JsonKeys::IS_TEMPLATE(), current.isTemplate},
|
||||
{JsonKeys::PROPERTIES(), current.properties},
|
||||
{JsonKeys::FILE_STATUS(), current.fileStatusId.underlying() },
|
||||
{JsonKeys::FILE_STATUS(), static_cast<int>(current.fileStatusId) },
|
||||
{JsonKeys::FOLDER_ID(), current.folderId },
|
||||
{JsonKeys::PHASE_ID(), current.phaseId.toInt() },
|
||||
{JsonKeys::OPERATOR_ID(), current.operatorId},
|
||||
|
||||
Reference in new issue
Block a user