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/object_folder.cpp
+32 -32
View File
@@ -25,21 +25,21 @@ ObjectFolder::~ObjectFolder()
bool ObjectFolder::isValid() const
{
return m_data.id() > 0;
return m_data.id > 0;
}
bool ObjectFolder::isUsed() const
{
return m_data.isUsed();
return m_data.isUsed;
}
Core::FunctionReplyObject ObjectFolder::createObject(const Folder &data)
{
m_data = data;
if (m_data.id() <= 0)
if (m_data.id <= 0)
{
m_data.isUsed(false);
m_data.isUsed = false;
Database::FlmFolder dbData;
dbData = toDbData(data);
@@ -49,26 +49,26 @@ Core::FunctionReplyObject ObjectFolder::createObject(const Folder &data)
QString errText = db()->getLastError().databaseText();
ERROR_LOG(m_logger) << "Error inserting Folder into database: " << errText;
if (db()->getLastError().nativeErrorCode().contains(QStringLiteral("23505")))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Folder into database: unique key violation inserting folder '%1'")).arg(m_data.name());
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Folder into database: unique key violation inserting folder '%1'")).arg(QString::fromStdString(m_data.name));
if (db()->getLastError().nativeErrorCode().contains(QStringLiteral("23503")))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Folder into database: foreign key violation inserting folder '%1'")).arg(m_data.name());
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Folder into database: foreign key violation inserting folder '%1'")).arg(QString::fromStdString(m_data.name));
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting Folder into database: %1")).arg(errText);
}
m_data.id(dbData.id);
DEBUG_LOG(m_logger) << "New Folder Id: " << m_data.id();
m_data.id = dbData.id;
DEBUG_LOG(m_logger) << "New Folder Id: " << m_data.id;
}
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
Core::FunctionReplyObject ObjectFolder::updateObject(const Folder &data)
{
if (!isValid())
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
Database::FlmFolder dbData(toDbData(data));
@@ -76,52 +76,52 @@ Core::FunctionReplyObject ObjectFolder::updateObject(const Folder &data)
{
QString errText = db()->getLastError().databaseText();
ERROR_LOG(m_logger) << "Error updating Folder into database: " << errText;
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating Folder into database: %1")).arg(errText);
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating Folder into database: %1")).arg(errText);
}
m_data = data;
DEBUG_LOG(m_logger) << "Data changed for Folder Id: " << m_data.id();
DEBUG_LOG(m_logger) << "Data changed for Folder Id: " << m_data.id;
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
Core::FunctionReplyObject ObjectFolder::setUsed(bool isUsed)
{
if (!isValid())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed Folder object"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed Folder object"));
m_data.isUsed(isUsed);
m_data.isUsed = isUsed;
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
Core::FunctionReplyObject ObjectFolder::removeObject()
{
if (isUsed())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Folder still in use"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Folder still in use"));
if (!db()->removeFlmFolder(m_data.id()))
if (!db()->removeFlmFolder(m_data.id))
{
QString errText = db()->getLastError().databaseText();
ERROR_LOG(m_logger) << "Folder with id " << m_data.id() << " can not be removed from database: " << errText;
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Folder with id %1 can not be removed from database: %2")).arg(m_data.id()).arg(errText);
ERROR_LOG(m_logger) << "Folder with id " << m_data.id << " can not be removed from database: " << errText;
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Folder with id %1 can not be removed from database: %2")).arg(m_data.id).arg(errText);
}
if (!dts()->removeFolderByKey(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Folder with id %1 can not be taken from DDS")).arg(m_data.id());
if (!dts()->removeFolderByKey(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Folder with id %1 can not be taken from DDS")).arg(m_data.id);
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
void ObjectFolder::onPublishData()
{
INFO_LOG(m_logger) << "Publish Folder-data to dds (" << m_data.id() << ") ...";
INFO_LOG(m_logger) << "Publish Folder-data to dds (" << m_data.id << ") ...";
if (!dts()->publish(m_data))
ERROR_LOG(m_logger) << "Error publishing Folder-data to dds";
@@ -136,14 +136,14 @@ Database::FlmFolder ObjectFolder::toDbData(const Folder &ddsData)
{
Database::FlmFolder dbData;
dbData.id = ddsData.id();
dbData.name = QString::fromStdString(ddsData.name());
dbData.path = LtsUtils::IntArray(ddsData.path());
dbData.isEditable = ddsData.isEditable();
dbData.isHidden = ddsData.isHidden();
dbData.parentId = ddsData.parentId();
dbData.operatorId = ddsData.operatorId();
dbData.lastModified = ddsData.lastModified();
dbData.id = ddsData.id;
dbData.name = QString::fromStdString(ddsData.name);
dbData.path = LtsUtils::IntArray(ddsData.path);
dbData.isEditable = ddsData.isEditable;
dbData.isHidden = ddsData.isHidden;
dbData.parentId = ddsData.parentId;
dbData.operatorId = ddsData.operatorId;
dbData.lastModified = ddsData.lastModified;
return dbData;
}