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(svcMrkCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ngldb
|
||||
ddscore
|
||||
NGLLogger
|
||||
@@ -110,7 +110,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkServer
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(svcMrkServer
|
||||
PRIVATE
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
RTI::nddscpp2
|
||||
ddsconnector
|
||||
ddsfts
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@ IF(BUILD_TESTING AND TARGET svcMrkClient)
|
||||
# Testing FunctionTopic Functionality (FTC)
|
||||
ADD_EXECUTABLE(mrkTests ${SRCS_MRK_TEST})
|
||||
TARGET_LINK_LIBRARIES(mrkTests
|
||||
Qt5::Core
|
||||
Qt5::Test
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
RTI::nddscpp2
|
||||
svcMrkClient
|
||||
LtsCommandLineParser
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "handler_marker.h"
|
||||
#include <utility>
|
||||
#include "object_marker.h"
|
||||
#include "dds_handler.h"
|
||||
|
||||
@@ -51,7 +52,7 @@ bool HandlerMarker::init()
|
||||
|
||||
// alle Descriptions zu der Marke eintragen
|
||||
// TODO: select descBymarkerId
|
||||
for (const Database::MrkMarkerDescription &desc : qAsConst(dataDescriptionVec))
|
||||
for (const Database::MrkMarkerDescription &desc : std::as_const(dataDescriptionVec))
|
||||
{
|
||||
if (desc.markerId == ddsMoData.id())
|
||||
ddsMoData.descriptions().push_back(ObjectMarker::toDdsData(desc));
|
||||
|
||||
Reference in new issue
Block a user