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

Migrates flm handlers and objects to plain member access

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-18 17:47:34 +02:00
1 parent e156fbb5e4
commit 3c058facd7
9 files changed
+217 -217
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/handler_folder.cpp
+41 -41
View File
@@ -67,7 +67,7 @@ bool HandlerFolder::init()
void HandlerFolder::onFolderModifyRequest(const rti::core::SampleIdentity &cookie,
const FileManagement::FolderModifyRequest &request)
{
auto ret = request.id() > 0 ? folderModifyRequest(request) : folderCreateRequest(request);
auto ret = request.id > 0 ? folderModifyRequest(request) : folderCreateRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
fts()->folderModifyReply(cookie, ret);
@@ -76,14 +76,14 @@ void HandlerFolder::onFolderModifyRequest(const rti::core::SampleIdentity &cooki
//---------------------------------------------------
Core::FunctionReplyObject HandlerFolder::folderCreateRequest(const FileManagement::FolderModifyRequest &request)
{
DEBUG_LOG(m_logger) << "Creating folder with name = " << request.name() << " under parent folder " << request.parentId();
DEBUG_LOG(m_logger) << "Creating folder with name = " << request.name << " under parent folder " << request.parentId;
Core::FunctionReplyObject ret;
Folder data;
std::vector<int> parentPath;
if (request.parentId() > 0 && m_objectFolderMap.contains(request.parentId()))
parentPath = m_objectFolderMap.value(request.parentId())->getPath();
if (request.parentId > 0 && m_objectFolderMap.contains(request.parentId))
parentPath = m_objectFolderMap.value(request.parentId)->getPath();
if (parentPath.size() == 0)
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Folder on root level"));
@@ -91,13 +91,13 @@ Core::FunctionReplyObject HandlerFolder::folderCreateRequest(const FileManagemen
std::vector<int> path = parentPath;
path.push_back(9999); // dummy id, only needed to retrieve later the proper id
data.name(request.name());
data.path(path);
data.isEditable(request.isEditable());
data.isHidden(request.isHidden());
data.parentId(request.parentId());
data.operatorId(request.operatorId());
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.name = request.name;
data.path = path;
data.isEditable = request.isEditable;
data.isHidden = request.isHidden;
data.parentId = request.parentId;
data.operatorId = request.operatorId;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
ObjectFolder *ifs(new ObjectFolder(m_mainHandler));
ret = ifs->createObject(data);
@@ -109,13 +109,13 @@ Core::FunctionReplyObject HandlerFolder::folderCreateRequest(const FileManagemen
}
else
{
data.id(ifs->getId());
data.id = ifs->getId();
// update path with the real id
path = parentPath;
path.resize(parentPath.size() + 1, ifs->getId());
data.path(path);
data.lastModified(QDateTime::currentMSecsSinceEpoch());
data.path = path;
data.lastModified = QDateTime::currentMSecsSinceEpoch();
ret = ifs->updateObject(data);
if (ret.error())
@@ -137,20 +137,20 @@ Core::FunctionReplyObject HandlerFolder::folderCreateRequest(const FileManagemen
//-------------------------------------------------------------------------------------------------------------
Core::FunctionReplyObject HandlerFolder::folderModifyRequest(const FileManagement::FolderModifyRequest &request)
{
ObjectFolder *ifs = m_objectFolderMap.value(request.id());
ObjectFolder *ifs = m_objectFolderMap.value(request.id);
if (ifs == nullptr)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Folder with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Folder with id %1 not found")).arg(request.id);
Folder newData;
newData.id(request.id());
newData.name(request.name());
newData.path(request.path());
newData.isEditable(request.isEditable());
newData.parentId(request.parentId());
newData.operatorId(request.operatorId());
newData.lastModified(QDateTime::currentMSecsSinceEpoch());
newData.isHidden(request.isHidden());
newData.id = request.id;
newData.name = request.name;
newData.path = request.path;
newData.isEditable = request.isEditable;
newData.parentId = request.parentId;
newData.operatorId = request.operatorId;
newData.lastModified = QDateTime::currentMSecsSinceEpoch();
newData.isHidden = request.isHidden;
return ifs->updateObject(newData);
}
@@ -160,9 +160,9 @@ void HandlerFolder::onPathCreateRequest(const rti::core::SampleIdentity &cookie,
{
Core::FunctionReplyObject ret;
int parentFolderId = request.parentId();
int parentFolderId = request.parentId;
DEBUG_LOG(m_logger) << "parentFolderId: " << parentFolderId;
for (const std::string &folderName : request.path())
for (const std::string &folderName : request.path)
{
int folderId = dtc()->findFolder(parentFolderId, QString::fromStdString(folderName));
DEBUG_LOG(m_logger) << "folderId: " << folderId << ", folderName: " << folderName;
@@ -180,12 +180,12 @@ void HandlerFolder::onPathCreateRequest(const rti::core::SampleIdentity &cookie,
// Folder does not exist => create folder
FolderModifyRequest folderRequest;
folderRequest.name(folderName);
folderRequest.parentId(parentFolderId);
folderRequest.path(ifs->getPath());
folderRequest.isEditable(request.isEditable());
folderRequest.isHidden(request.isHidden());
folderRequest.operatorId(request.operatorId());
folderRequest.name = folderName;
folderRequest.parentId = parentFolderId;
folderRequest.path = ifs->getPath();
folderRequest.isEditable = request.isEditable;
folderRequest.isHidden = request.isHidden;
folderRequest.operatorId = request.operatorId;
ret = folderCreateRequest(folderRequest);
@@ -208,22 +208,22 @@ void HandlerFolder::onFolderRemoveRequest(const rti::core::SampleIdentity &cooki
{
Core::FunctionReplyObject ret;
ObjectFolder *ifs = m_objectFolderMap.value(request.id());
ObjectFolder *ifs = m_objectFolderMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Folder with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Folder with id %1 not found")).arg(request.id);
fts()->folderRemoveReply(cookie, ret);
return;
}
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Folder '%1' is used by another user!")).arg(ifs->getName());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Folder '%1' is used by another user!")).arg(ifs->getName());
fts()->folderRemoveReply(cookie, ret);
return;
}
ret = removeFolder(request.id());
ret = removeFolder(request.id);
delete ifs;
@@ -273,17 +273,17 @@ void HandlerFolder::onFileContentRemoveRequest(const rti::core::SampleIdentity &
const Core::RemoveElementRequest &request)
{
Core::FunctionReplyObject ret;
ObjectFileContent *ifs = m_mainHandler->getHandlerFileContent()->getObjectFileContentMap().value(request.id());
ObjectFileContent *ifs = m_mainHandler->getHandlerFileContent()->getObjectFileContentMap().value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "FileContent with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "FileContent with id %1 not found")).arg(request.id);
fts()->fileContentRemoveReply(cookie, ret);
return;
}
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "FileContent '%1' is used by another user!")).arg(ifs->getName());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "FileContent '%1' is used by another user!")).arg(ifs->getName());
fts()->folderRemoveReply(cookie, ret);
return;
}
@@ -296,7 +296,7 @@ void HandlerFolder::onFileContentRemoveRequest(const rti::core::SampleIdentity &
{
// delete ObjectFileContent
delete ifs;
m_mainHandler->getHandlerFileContent()->getObjectFileContentMap().remove(request.id());
m_mainHandler->getHandlerFileContent()->getObjectFileContentMap().remove(request.id);
}
fts()->fileContentRemoveReply(cookie, ret);
@@ -315,7 +315,7 @@ void HandlerFolder::removeFilesForFolder(int folderId)
{
if (file->getFolderId() == folderId)
{
request.id(file->getId());
request.id = file->getId();
auto ret = m_mainHandler->getHandlerFileContent()->fileContentRemoveRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();