Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -42,7 +42,7 @@ NGL_TARGET_LINK_LIBRARIES(svcNomCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddscore
|
||||
ngldb
|
||||
LtsCommandLineParser
|
||||
@@ -133,7 +133,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcNotificationManagement ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcNotificationManagement
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
svcNomCommon
|
||||
svcNomServer
|
||||
svcExmClient
|
||||
|
||||
+2
-2
@@ -15,8 +15,8 @@ IF(BUILD_TESTING AND TARGET svcNomClient)
|
||||
# Testing FunctionTopic Functionality (FTC)
|
||||
ADD_EXECUTABLE(nomTests ${SRCS_MRK_TEST})
|
||||
TARGET_LINK_LIBRARIES(nomTests
|
||||
Qt5::Core
|
||||
Qt5::Test
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
RTI::nddscpp2
|
||||
svcNomClient
|
||||
svcOpmClient
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_notification.h"
|
||||
#include <utility>
|
||||
#include "object_notification.h"
|
||||
#include "dds_handler.h"
|
||||
#include "settings.h"
|
||||
@@ -64,7 +65,7 @@ bool HandlerNotification::init()
|
||||
}
|
||||
|
||||
// alle Addressen zu der NomNotification eintragen
|
||||
for (const Database::NomAddress &addr : qAsConst(dataAddressVec))
|
||||
for (const Database::NomAddress &addr : std::as_const(dataAddressVec))
|
||||
{
|
||||
if (addr.notificationId == notif.id())
|
||||
{
|
||||
|
||||
+7
-6
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "object_notification.h"
|
||||
#include <utility>
|
||||
#include "dds_handler.h"
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
@@ -96,7 +97,7 @@ QString ObjectNotification::contentArgsToJson()
|
||||
int i = 1;
|
||||
QJsonArray jsonArray;
|
||||
|
||||
for (const std::string& arg : qAsConst(m_dataNotificationObject.contentArgs()))
|
||||
for (const std::string& arg : std::as_const(m_dataNotificationObject.contentArgs()))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
|
||||
<< ", arg=" << arg;
|
||||
@@ -138,7 +139,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 : qAsConst(jsonArray))
|
||||
for (const QJsonValue &wert : std::as_const(jsonArray))
|
||||
{
|
||||
QJsonObject obj = wert.toObject();
|
||||
int id = obj[CONTENT_ID].toInt();
|
||||
@@ -168,7 +169,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
|
||||
|
||||
Database::NomAddress dbDataAddr;
|
||||
|
||||
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds()))
|
||||
for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds()))
|
||||
{
|
||||
if (data.operatorId() > 0 && recipientAddr.addressType() == AddressType_def::Operator && recipientAddr.addressId() != data.operatorId())
|
||||
continue;
|
||||
@@ -223,7 +224,7 @@ Core::FunctionReplyObject ObjectNotification::readReceipt(const ReadReceipt &dat
|
||||
m_dataNotificationObject = toDdsData(dbDataNotification);
|
||||
m_dataNotificationObject.sender(sender);
|
||||
|
||||
for (const Address &addr : qAsConst(recipients))
|
||||
for (const Address &addr : std::as_const(recipients))
|
||||
{
|
||||
if (addr.id() == dbDataAddr.id)
|
||||
m_dataNotificationObject.recipientIds().push_back(toDdsData(dbDataAddr));
|
||||
@@ -247,7 +248,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
|
||||
|
||||
Database::NomAddress dbDataAddr;
|
||||
|
||||
for (const Address &recipientAddr : qAsConst(m_dataNotificationObject.recipientIds()))
|
||||
for (const Address &recipientAddr : std::as_const(m_dataNotificationObject.recipientIds()))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "recipientAddr="
|
||||
<< ", id: " << recipientAddr.id() << ", addressId: " << recipientAddr.addressId() << ", isDeleted: " << recipientAddr.isDeleted();
|
||||
@@ -282,7 +283,7 @@ Core::FunctionReplyObject ObjectNotification::deleteMessage(const DeleteMessage
|
||||
m_dataNotificationObject = toDdsData(dbDataNotification);
|
||||
m_dataNotificationObject.sender(sender);
|
||||
|
||||
for (const Address &addr : qAsConst(recipients))
|
||||
for (const Address &addr : std::as_const(recipients))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "addr="
|
||||
<< ", id: " << addr.id() << ", addressId: " << addr.addressId() << ", isDeleted: " << addr.isDeleted();
|
||||
|
||||
Reference in new issue
Block a user