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/NotificationManagement/object_notification.cpp
+10 -10
View File
@@ -7,13 +7,12 @@
*/
#include "object_notification.h"
#include <utility>
#include "dds_handler.h"
#include <ngldb/dbtransaction.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonObject>
#include <QJsonDocument>
#include <QJsonArray>
#include <QJsonObject>
namespace NotificationManagement
{
@@ -25,6 +24,7 @@ const QString CONTENT_ARG = QStringLiteral("contentArg");
ObjectNotification::ObjectNotification(const std::shared_ptr<DdsHandler> &ddsHandler, const std::shared_ptr<DatabaseInterface> &db)
: m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("ObjectNotification"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ QString ObjectNotification::contentArgsToJson()
int i = 1;
QJsonArray jsonArray;
for (const std::string& arg : std::as_const(m_dataNotificationObject.contentArgs()))
for (const std::string& arg : qAsConst(m_dataNotificationObject.contentArgs()))
{
DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
<< ", arg=" << arg;
@@ -138,7 +138,7 @@ std::vector<std::string> ObjectNotification::jsonToContentArgs(const QString &js
{
// 3. Für schnellen Zugriff nach ID indizieren
QHash<int, QJsonObject> sucheMap;
for (const QJsonValue &wert : std::as_const(jsonArray))
for (const QJsonValue &wert : qAsConst(jsonArray))
{
QJsonObject obj = wert.toObject();
int id = obj[CONTENT_ID].toInt();
@@ -168,7 +168,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
Database::NomAddress dbDataAddr;
for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds()))
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds()))
{
if (data.operatorId() > 0 && recipientAddr.addressType() == AddressType_def::Operator && recipientAddr.addressId() != data.operatorId())
continue;
@@ -223,7 +223,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
m_dataNotificationObject = toDdsData(dbDataNotification);
m_dataNotificationObject.sender(sender);
for (const Address &addr : std::as_const(recipients))
for (const Address &addr : qAsConst(recipients))
{
if (addr.id() == dbDataAddr.id)
m_dataNotificationObject.recipientIds().push_back(toDdsData(dbDataAddr));
@@ -247,7 +247,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
Database::NomAddress dbDataAddr;
for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds()))
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds()))
{
DEBUG_LOG(m_logger) << "recipientAddr="
<< ", id: " << recipientAddr.id() << ", addressId: " << recipientAddr.addressId() << ", isDeleted: " << recipientAddr.isDeleted();
@@ -282,7 +282,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
m_dataNotificationObject = toDdsData(dbDataNotification);
m_dataNotificationObject.sender(sender);
for (const Address &addr : std::as_const(recipients))
for (const Address &addr : qAsConst(recipients))
{
DEBUG_LOG(m_logger) << "addr="
<< ", id: " << addr.id() << ", addressId: " << addr.addressId() << ", isDeleted: " << addr.isDeleted();