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/skeleton/base/CMakeLists.txt
+3 -9
View File
@@ -30,13 +30,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# Generate xxx_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcXxxCommon SHARED ${SRCS_common})
NGL_ADD_LIBRARY(AAR SV WS svcXxxCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcXxxCommon
PRIVATE
RTI::nddscpp2
@@ -45,7 +44,6 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxCommon
ddscore
NGLLogger
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcXxxCommon)
#
@@ -57,14 +55,13 @@ SET(SRCS_client
# generate xxx_[d|f]tc.h, xxx_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcXxxClient SHARED ${SRCS_client})
NGL_ADD_LIBRARY(AAR SV WS svcXxxClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcXxxClient
PRIVATE
RTI::nddscpp2
@@ -73,7 +70,6 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxClient
svcXxxCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcXxxClient)
#
@@ -87,14 +83,13 @@ CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
# Generate xxx_db_impl.cpp/.h, xxx_db.h
CODEGEN_DATABASE(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV svcXxxServer SHARED ${SRCS_server})
NGL_ADD_LIBRARY(AAR SV svcXxxServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcXxxServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcXxxServer
PRIVATE
RTI::nddscpp2
@@ -104,7 +99,6 @@ NGL_TARGET_LINK_LIBRARIES(svcXxxServer
PUBLIC
svcXxxCommon
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcXxxServer)
#
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp
+1
View File
@@ -19,6 +19,7 @@ namespace XxxXxxXxx
DdsHandler::DdsHandler(int domainId, int exerciseId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::FIXME, exerciseId))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h
+2 -1
View File
@@ -45,12 +45,13 @@ public:
}
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<DTS::CurrentRunningState> m_dtsCurrentRunningState;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<XxxXxxXxx::Interface::Dts> m_ddsDts;
std::shared_ptr<XxxXxxXxx::Interface::Fts> m_ddsFts;
NGL::INGLLogger &m_logger;
};
} // namespace XxxXxxXxx
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/logger.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <NGLLogger/INGLLogger.h>
#include "svcxxxcommon_export.h"
#include "xxx_export.h"
namespace XxxXxxXxx
{
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.cpp
+5 -3
View File
@@ -13,10 +13,12 @@
namespace XxxXxxXxx
{
MainHandler::MainHandler(QObject *parent) : QObject(parent)
MainHandler::MainHandler(QObject *parent)
: QObject(parent)
, m_ddsHandler(nullptr)
, m_dbHandler(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_dbHandler(nullptr)
, m_logger(getLogger("MainHandler"))
{}
MainHandler::~MainHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/main_handler.h
+4 -2
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QtCore/QObject>
#include <QObject>
#include <memory>
#include "dds_handler.h"
#include "xxx_db.h"
@@ -33,8 +33,10 @@ public:
std::shared_ptr<DatabaseInterface> db() const;
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
NGL::INGLLogger &m_logger;
};
} // namespace XxxXxxXxx
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/settings.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QtCore/QString>
#include <QString>
namespace NGL
{
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.cpp
+7 -6
View File
@@ -7,12 +7,11 @@
*/
#include "handler_xxx_xxx.h"
#include <utility>
#include "object_xxx_xxx.h"
#include "yyy_db.h"
#include "db_handler.h"
#include <QtCore/QCoreApplication>
#include <QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace YyyYyyYyy
@@ -20,10 +19,12 @@ namespace YyyYyyYyy
HandlerXxx::HandlerXxx(const std::shared_ptr<DdsHandler> &ddsHandler,
const std::shared_ptr<DbHandler> &dbHandler,
QObject *parent) : QObject(parent)
QObject *parent)
: QObject(parent)
, m_ddsHandler(ddsHandler)
, m_dbHandler(dbHandler),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
, m_dbHandler(dbHandler)
, m_logger(getLogger("HandlerXxx"))
{}
HandlerXxx::~HandlerXxx()
{}
@@ -39,7 +40,7 @@ bool HandlerXxx::init()
}
// create languageHmi objects
for (const Database::YyyXxx &data : std::as_const(dataVec))
for (const Database::YyyXxx &data : qAsConst(dataVec))
{
ObjectXxx *ifs(new ObjectXxx(m_ddsHandler, m_dbHandler, this));
Core::FunctionReplyObject ret = ifs->createObject(data);
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/handler_xxx.h
+3 -3
View File
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QtCore/QMap>
#include <QMap>
#include "dds_handler.h"
#include "logger.h"
@@ -29,11 +29,11 @@ public:
private:
NGL::INGLLogger &m_logger;
private:
NGL::INGLLogger &m_logger;
QMap<int, ObjectXxx*> m_xxxObjMap;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
NGL::INGLLogger &m_logger;
};
}
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.cpp
+1
View File
@@ -20,6 +20,7 @@ namespace YyyYyyYyy
: QObject(parent)
, m_ddsHandler(ddsHandler)
, m_dbHandler(dbHandler)
, m_logger(getLogger("ObjectXxx"))
{
}
qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h
+5 -4
View File
@@ -6,11 +6,11 @@
*/
#pragma once
#include <QtCore/QObject>
#include <QObject>
#include "dds_handler.h"
#include "logger.h"
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h>
// Generated
#include <YyyYyyYyy/yyy_db.h>
@@ -39,10 +39,11 @@ namespace YyyYyyYyy
void onPublishData();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
Database::YyyXxx m_data;
NGL::INGLLogger &m_logger;
};
}