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/MarkerManagement/CMakeLists.txt
+3 -9
View File
@@ -32,13 +32,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate mrk_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcMrkCommon SHARED ${SRCS_common})
NGL_ADD_LIBRARY(AAR SV WS svcMrkCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcMrkCommon
PRIVATE
RTI::nddscpp2
@@ -48,7 +47,6 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkCommon
ddscore
NGLLogger
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcMrkCommon)
#
@@ -60,14 +58,13 @@ SET(SRCS_client
# generate mrk_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcMrkClient SHARED ${SRCS_client})
NGL_ADD_LIBRARY(AAR SV WS svcMrkClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcMrkClient
PRIVATE
RTI::nddscpp2
@@ -76,7 +73,6 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkClient
svcMrkCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcMrkClient)
#
@@ -105,14 +101,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
# Generate mrk.sql, mrk.xml
CODEGEN_SQL(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV svcMrkServer SHARED ${SRCS_server})
NGL_ADD_LIBRARY(AAR SV svcMrkServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcMrkServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcMrkServer
PRIVATE
Qt6::Core
@@ -128,7 +123,6 @@ NGL_TARGET_LINK_LIBRARIES(svcMrkServer
svcMrkCommon
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcMrkServer)
#
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp
+5 -4
View File
@@ -9,10 +9,10 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QTimer>
#include <QDateTime>
#include <QString>
#include <QVector>
#include <MarkerManagement/mrk_ftc.h>
#include <MarkerManagement/mrk_dtc.h>
@@ -27,6 +27,7 @@ MrkTests::MrkTests(QObject *parent)
, m_markerId(0)
, m_eTestStep(eUnknown)
, m_bTestsSuccessful(true)
, m_logger(getLogger("MrkTests"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
} // end of ctor()
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.h
+2 -1
View File
@@ -65,7 +65,6 @@ protected Q_SLOTS:
void onReceiveMarkerChanged(const Marker &data, DataModification modType);
protected:
NGL::INGLLogger &m_logger;
// Callbackfunctions for FTC
void onMarkerCreateReply(const Core::FunctionReplyObject &replyObject);
void onMarkerModifyReply(const Core::FunctionReplyObject &replyObject) override final;
@@ -106,6 +105,8 @@ private:
} m_eTestStep;
bool m_bTestsSuccessful;
NGL::INGLLogger &m_logger;
};
} // namespace MarkerManagement
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.cpp
+1
View File
@@ -13,6 +13,7 @@ namespace MarkerManagement
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
: m_ddsConnector(ddsConnector)
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h
+2 -1
View File
@@ -29,11 +29,12 @@ public:
std::shared_ptr<MarkerManagement::Interface::Fts> fts() const { return m_ddsFts; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
std::shared_ptr<MarkerManagement::Interface::Dts> m_ddsDts;
std::shared_ptr<MarkerManagement::Interface::Fts> m_ddsFts;
NGL::INGLLogger &m_logger;
};
} // namespace MarkerManagement
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.cpp
+2 -2
View File
@@ -7,7 +7,6 @@
*/
#include "handler_marker.h"
#include <utility>
#include "object_marker.h"
#include "dds_handler.h"
@@ -20,6 +19,7 @@ HandlerMarker::HandlerMarker(const std::shared_ptr<DdsHandler> &ddsHandler,
, Interface::Fts::MarkerRemoveRequestHandler(ddsHandler->fts())
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("HandlerMarker"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ bool HandlerMarker::init()
// alle Descriptions zu der Marke eintragen
// TODO: select descBymarkerId
for (const Database::MrkMarkerDescription &desc : std::as_const(dataDescriptionVec))
for (const Database::MrkMarkerDescription &desc : qAsConst(dataDescriptionVec))
{
if (desc.markerId == ddsMoData.id())
ddsMoData.descriptions().push_back(ObjectMarker::toDdsData(desc));
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_marker.h
+2 -2
View File
@@ -29,8 +29,6 @@ public:
bool init();
private: // methods
NGL::INGLLogger &m_logger;
void onMarkerModifyRequest(const rti::core::SampleIdentity &cookie,
const Marker &request) override final;
Core::FunctionReplyObject markerCreateRequest(const Marker &request);
@@ -43,6 +41,8 @@ NGL::INGLLogger &m_logger;
private: // attributes
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
NGL::INGLLogger &m_logger;
QHash<int, ObjectMarker *> m_objectMarkerMap;
};
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.cpp
+1
View File
@@ -19,6 +19,7 @@ HandlerSnapshot::HandlerSnapshot(const std::shared_ptr<DdsHandler> &ddsHandler,
, Interface::Fts::SnapshotRemoveRequestHandler(ddsHandler->fts())
, m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("HandlerSnapshot"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/handler_snapshot.h
+2 -2
View File
@@ -29,8 +29,6 @@ public:
bool init();
private: // methods
NGL::INGLLogger &m_logger;
void onSnapshotModifyRequest(const rti::core::SampleIdentity &cookie,
const Snapshot &request) override final;
Core::FunctionReplyObject snapshotCreateRequest(const Snapshot &request);
@@ -42,6 +40,8 @@ NGL::INGLLogger &m_logger;
private: // attributes
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
NGL::INGLLogger &m_logger;
QHash<int, ObjectSnapshot *> m_objectSnapshotMap;
};
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/initialization.h
+3 -2
View File
@@ -37,11 +37,12 @@ public:
bool loadFromDatabase();
private: // attributes
NGL::INGLLogger &m_logger;
std::shared_ptr<DbHandler> m_dbHandler;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::unique_ptr<HandlerMarker> m_handlerMarker;
std::unique_ptr<HandlerSnapshot> m_handlerSnapshot;
NGL::INGLLogger &m_logger;
};
} // namespace MarkerManagement
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/logger.h
+2 -2
View File
@@ -9,13 +9,13 @@
#pragma once
#include <NGLLogger/INGLLogger.h>
#include <MarkerManagement/svcmrkcommon_export.h>
#include "mrk_export.h"
namespace MarkerManagement
{
using LOGGER_T = NGL::INGLLogger &;
SVCMRKCOMMON_EXPORT LOGGER_T getLogger(const char *name);
MRK_COMMON_EXPORT LOGGER_T getLogger(const char *name);
inline LOGGER_T getLogger(const QString &loggerName)
{
return getLogger(loggerName.toUtf8().constData());
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.cpp
+1
View File
@@ -16,6 +16,7 @@ namespace MarkerManagement
ObjectMarker::ObjectMarker(const std::shared_ptr<DdsHandler> &ddsHandler, const std::shared_ptr<DatabaseInterface> &db)
: m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("ObjectMarker"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h
+4 -3
View File
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "mrk_db.h"
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h>
// Generated
#include <MarkerManagement/mrk_db.h>
@@ -48,13 +48,14 @@ public:
static MarkerDescription toDdsData(const Database::MrkMarkerDescription &dbData); // db -> dds
private:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
Marker m_dataMarkerObject;
NGL::INGLLogger &m_logger;
};
} // namespace MarkerManagement
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.cpp
+1
View File
@@ -15,6 +15,7 @@ namespace MarkerManagement
ObjectSnapshot::ObjectSnapshot(const std::shared_ptr<DdsHandler> &ddsHandler, const std::shared_ptr<DatabaseInterface> &db)
: m_ddsHandler(ddsHandler)
, m_db(db)
, m_logger(getLogger("ObjectSnapshot"))
{
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h
+5 -4
View File
@@ -8,10 +8,10 @@
#pragma once
#include <QtCore/QVector>
#include <QVector>
#include "dds_handler.h"
#include "mrk_db.h"
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h>
// Generated
#include <MarkerManagement/mrk_db.h>
@@ -41,14 +41,15 @@ public:
static Snapshot toDdsData(const Database::MrkSnapshot &dbData); // db -> dds
private:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
MarkerManagement::Snapshot m_dataSnapshot;
NGL::INGLLogger &m_logger;
};
} // namespace MarkerManagement
qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/settings.h
+1 -1
View File
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QtCore/QString>
#include <QString>
namespace NGL
{