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

Session 026: Lts/Services Qt5:: to Qt6:: migration

Browse Source 
- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
1244 files changed
+4266 -4633
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp
+5 -4
View File
@@ -11,7 +11,7 @@
#include "handler_operator.h"
#include <DDS/FTS/generic_fts_impl.h>
#include <DDS/DTS/generic_dts_impl.h>
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h>
#include <QMutableHashIterator>
@@ -22,6 +22,7 @@ HandlerLockedTopics::HandlerLockedTopics(MainHandler &mainHandler,
QObject *parent)
: QObject(parent)
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerLockedTopics"))
{}
bool HandlerLockedTopics::init()
@@ -260,7 +261,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
// }
// const Database::OpmLockedTopics &lockedTopic = *lockedTopicIt;
// DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": locked topic id " << lockedTopic.id;
// DEBUG_LOG(m_logger) << LOGFUNCTION << ": locked topic id " << lockedTopic.id;
// // ... and then reinserting the updated lock entity (as the id has now changed) - while the key (op, ws, exc, topic id) stays the same!
// m_lockedTopics[requestedKey] = dbStruct;
// }
@@ -280,13 +281,13 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
// if (lockedTopicIt == m_lockedTopics.constEnd())
// {
// ERROR_LOG(m_logger) << Q_FUNC_INFO << ": Failed to release outdated lock as lock entity id ("<<lockedTopicIt<<") was not found!";
// ERROR_LOG(m_logger) << LOGFUNCTION << ": Failed to release outdated lock as lock entity id ("<<lockedTopicIt<<") was not found!";
// Q_ASSERT(false);
// return false;
// }
// const Database::OpmLockedTopics &lockedTopic = *lockedTopicIt;
// DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": found lock entity " << lockEntityId;
// DEBUG_LOG(m_logger) << LOGFUNCTION << ": found lock entity " << lockEntityId;
// unlockInDb(lockedTopic);
// removeLockedEntity(lockEntityId);