Session 026: Lts/Services Qt5:: to Qt6:: migration

- 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

No files matched your search

@@ -32,13 +32,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# Generate whg_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcWhgCommon SHARED ${SRCS_common})
NGL_ADD_LIBRARY(AAR SV WS svcWhgCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcWhgCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcWhgCommon
PRIVATE
RTI::nddscpp2
@@ -48,7 +47,6 @@ NGL_TARGET_LINK_LIBRARIES(svcWhgCommon
NGLLogger
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcWhgCommon)
#
@@ -60,14 +58,13 @@ SET(SRCS_client
# generate whg_[d|f]tc.h, whg_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV WS svcWhgClient SHARED ${SRCS_client})
NGL_ADD_LIBRARY(AAR SV WS svcWhgClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcWhgClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcWhgClient
PRIVATE
RTI::nddscpp2
@@ -76,7 +73,6 @@ NGL_TARGET_LINK_LIBRARIES(svcWhgClient
svcWhgCommon
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcWhgClient)
#
@@ -88,14 +84,13 @@ SET(SRCS_server
# generate whg_[d|f]ts.h, whg_[d|f]ts_impl.[cpp|h]
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY2(AAR SV svcWhgServer SHARED ${SRCS_server})
NGL_ADD_LIBRARY(AAR SV svcWhgServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcWhgServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcWhgServer
PRIVATE
RTI::nddscpp2
@@ -105,7 +100,6 @@ NGL_TARGET_LINK_LIBRARIES(svcWhgServer
svcWhgCommon
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcWhgServer)
#
@@ -11,12 +11,12 @@
#include <nglsettings/nglsettings_connections.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonDocument>
#include <QTimer>
#include <QDateTime>
#include <QString>
#include <QVector>
#include <QJsonObject>
#include <QJsonDocument>
#include <QtNetwork/QHostAddress>
@@ -37,6 +37,7 @@ WhgTests::WhgTests(QObject *parent)
, m_boxId(0)
, m_eTestStep(eUnknown)
, m_bTestsSuccessful(true)
, m_logger(getLogger("Test"))
{
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
} // end of ctor()
@@ -68,7 +68,6 @@ protected Q_SLOTS:
void onReceiveEqtTypeChanged(const WarehouseGuez::EquipmentTypeWh &data, DataModification modType);
protected:
NGL::INGLLogger &m_logger;
// Callbackfunctions for FTC
void onModifyEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject) override final;
void onRemoveEquipmentTypeWhReply(const Core::FunctionReplyObject &replyObject) override final;
@@ -117,6 +116,8 @@ private:
} m_eTestStep;
bool m_bTestsSuccessful;
NGL::INGLLogger &m_logger;
};
} // namespace WarehouseGuez
@@ -18,7 +18,7 @@
#include <WMS_Interface/wms_ecc_playerInfo.h>
#include <WMS_Interface/wms_ecc_registration.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
@@ -12,8 +12,8 @@
#include <DDS/Core/core.hpp>
#include <QtCore/QString>
#include <QtCore/QMap>
#include <QString>
#include <QMap>
#include <QtCore/QVector>
#include <QtCore/QJsonObject>
@@ -8,7 +8,6 @@
* Created by Philipp Dassow, SLST, 2017-12-05
*/
#include "WsBaseDataInterface/data_manager.h"
#include <utility>
#include <WMS_Interface/IWMS2ECC.h>
#include <WMS_Interface/wms_ecc_equipmenttypes.h>
@@ -20,12 +19,12 @@
#include "main_handler.h"
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QMap>
#include <QtSql/QSqlRecord>
#include <QtCore/QTimer>
#include <QtCore/QVector>
#include <QJsonDocument>
#include <QJsonObject>
#include <QMap>
#include <QSqlRecord>
#include <QTimer>
#include <QVector>
namespace WarehouseGuez
@@ -502,7 +501,7 @@ void DataManager::reconnectSignals()
QVector<Database::Exercise> vecExercises;
m_mainHandler->db()->select(vecExercises);
for (const auto &exercise : std::as_const(vecExercises))
for (const auto &exercise : qAsConst(vecExercises))
{
createTriggerForExercise(q, exercise.id);
const QString tn = triggerName(exercise.id);
@@ -16,10 +16,10 @@
#include <WMS_Interface/wms_ecc_exercises.h>
#include <WMS_Interface/wms_ecc_playerInfo.h>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <LtsUtilsCore/data_modification_enum.h>
#include <QtCore/QObject>
#include <QtSql/QSqlDriver>
#include <QObject>
#include <QSqlDriver>
class NSqlQuery;
namespace WarehouseGuez
@@ -24,6 +24,7 @@ WsBaseDataInterfaceHandler::WsBaseDataInterfaceHandler(MainHandler *mainHandler,
, m_messageFactory(nullptr)
, m_dataManager(nullptr)
, m_mainHandler(mainHandler)
, m_logger(getLogger("WsBaseDataInterfaceHandler"))
{
}
@@ -46,14 +46,14 @@ private Q_SLOTS:
void onSocketDisconnect();
private: // methods
NGL::INGLLogger &m_logger;
void sendMessages();
private: // attributes
QWebSocket *m_socket;
QQueue<Messages::ReplyMessage> m_messageQueue;
QHostAddress m_ip;
LOGGER_T m_logger;
}; // class ClientConnection
} // namespace Connection
} // namespace WsBiteInterface
@@ -7,7 +7,6 @@
* Created by Hannes Fritsche, SLSE, 2017-09-07
*/
#include "connection_handler.h"
#include <utility>
#include "client_connection.h"
#include "WsBiteInterface/Messages/message_transmitter.h"
@@ -19,13 +18,15 @@
using namespace WarehouseGuez::WsBiteInterface::Connection;
ConnectionHandler::ConnectionHandler() : m_server(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
ConnectionHandler::ConnectionHandler()
: m_server(nullptr)
, m_logger(getLogger("ConnectionHandler"))
{
}
ConnectionHandler::~ConnectionHandler()
{
for (auto s : std::as_const(m_connections))
for (auto s : qAsConst(m_connections))
s->disconnect(this);
qDeleteAll(m_connections);
}
@@ -106,7 +107,7 @@ void ConnectionHandler::onDisconnected(ClientConnection *conn)
/*
void ConnectionHandler::onPositions(const ::WsBiteInterface::Messages::ReplyMessage &positionsCnr)
{
for (ClientConnection *currentConnection : std::as_const(m_connections))
for (ClientConnection *currentConnection : qAsConst(m_connections))
currentConnection->addMessage(positionsCnr);
}
*/
@@ -50,10 +50,10 @@ private Q_SLOTS:
void onDisconnected(ClientConnection *conn);
private: // attributes
NGL::INGLLogger &m_logger;
QWebSocketServer *m_server;
QVector<ClientConnection *> m_connections;
LOGGER_T m_logger;
};
} // namespace Connection
} // namespace WsBiteInterface
@@ -18,8 +18,10 @@ namespace WsBiteInterface
namespace Messages
{
MessageHandler::MessageHandler(DataManager *dataManager) : m_dataManager(dataManager),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
MessageHandler::MessageHandler(DataManager *dataManager)
: m_dataManager(dataManager)
, m_logger(getLogger("MessageHandler"))
{
Q_ASSERT(dataManager);
}
@@ -34,9 +34,9 @@ public Q_SLOTS:
void onNewTextMessage(MessageTransmitter *transmitter, const QString &message);
private:
NGL::INGLLogger &m_logger;
DataManager *m_dataManager;
LOGGER_T m_logger;
};
} // namespace Messages
} // namespace WsBiteInterface
@@ -13,13 +13,13 @@
#include <WarehouseGuez/WsBiteInterface/json_keys.h>
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
#include <LtsUtilsCore/outdated_position.h>
#include <nglsettings/nglsettings_connections.h>
#include <QtCore/QMap>
#include <QtCore/QUuid>
#include <QtCore/QJsonDocument>
#include <QMap>
#include <QUuid>
#include <QJsonDocument>
namespace WarehouseGuez
{
@@ -10,9 +10,9 @@
#include <memory>
#include <QtCore/QHash>
#include <QtCore/QSet>
#include <QtCore/QTimer>
#include <QHash>
#include <QSet>
#include <QTimer>
#include <WarehouseGuez/WsBiteInterface/Messages/ws_reply_message.h>
#include "logger.h"
@@ -66,8 +66,6 @@ private Q_SLOTS:
private: // methods
NGL::INGLLogger &m_logger;
void connectToTabWebSocket(int port, int exerciseId);
private: // attributes
@@ -94,6 +92,8 @@ private: // attributes
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_tabDtc; ///< Pointer to DTC Training Area Base interface object
QTimer *m_timer = nullptr;
LOGGER_T m_logger;
}; // class DataManager
} // namespace WsBiteInterface
} // namespace WarehouseGuez
@@ -23,6 +23,7 @@ WsBiteInterfaceHandler::WsBiteInterfaceHandler(DataManager *dataManager)
: m_dataManager(dataManager)
, m_connectionHandler(nullptr)
, m_messageHandler(nullptr)
, m_logger(getLogger("WsBiteInterfaceHandler"))
{
Q_ASSERT(dataManager);
}
@@ -14,6 +14,7 @@ namespace WarehouseGuez
DdsHandler::DdsHandler(int domainId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Global))
, m_logger(getLogger("DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
@@ -44,12 +44,13 @@ public:
std::shared_ptr<DDSConnector::DdsConnector> dds() const { return m_ddsConnector; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
std::shared_ptr<WarehouseGuez::Interface::Dts> m_ddsDts;
std::shared_ptr<WarehouseGuez::Interface::Fts> m_ddsFts;
NGL::INGLLogger &m_logger;
};
} // namespace WarehouseGuez
@@ -17,6 +17,7 @@ HandlerEquipmentTypeWh::HandlerEquipmentTypeWh(MainHandler *mainHandler)
: Interface::Fts::ModifyEquipmentTypeWhRequestHandler(mainHandler->dds()->fts())
, Interface::Fts::RemoveEquipmentTypeWhRequestHandler(mainHandler->dds()->fts())
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerEquipmentTypeWh"))
{}
HandlerEquipmentTypeWh::~HandlerEquipmentTypeWh()
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QtCore/QHash>
#include <QHash>
#include "logger.h"
#include "main_handler.h"
@@ -27,14 +27,13 @@ public:
bool init();
private:
NGL::INGLLogger &m_logger;
void onModifyEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const EquipmentTypeWh &request) override final;
void onRemoveEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request) override final;
void sendToEXCON();
private:
NGL::INGLLogger &m_logger;
QHash<int, ObjectEquipmentTypeWh*> m_equipmenttypewhObjMap;
MainHandler *m_mainHandler;
NGL::INGLLogger &m_logger;
};
}
@@ -18,6 +18,7 @@ HandlerInjuryModel::HandlerInjuryModel(MainHandler *mainHandler)
: Interface::Fts::ModifyInjuryModelAgdusWhRequestHandler(mainHandler->dds()->fts())
, Interface::Fts::RemoveInjuryModelAgdusWhRequestHandler(mainHandler->dds()->fts())
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerInjuryModel"))
{}
HandlerInjuryModel::~HandlerInjuryModel()
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QtCore/QHash>
#include <QHash>
#include "main_handler.h"
#include "logger.h"
@@ -26,13 +26,13 @@ public:
bool init();
private:
NGL::INGLLogger &m_logger;
void onModifyInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const InjuryModelAgdusWh &request);
void onRemoveInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request);
private:
NGL::INGLLogger &m_logger;
QHash<int, ObjectInjuryModel*> m_injurymodelObjMap;
MainHandler* m_mainHandler;
NGL::INGLLogger &m_logger;
};
}
@@ -13,8 +13,10 @@
namespace WarehouseGuez
{
HandlerTypes::HandlerTypes(MainHandler *mainHandler) : m_mainHandler(mainHandler),
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
HandlerTypes::HandlerTypes(MainHandler *mainHandler)
: m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerTypes"))
{}
bool HandlerTypes::init()
{
@@ -7,9 +7,9 @@
*/
#pragma once
#include <QtCore/QHash>
#include <QHash>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include "main_handler.h"
#include "logger.h"
@@ -28,8 +28,9 @@ private Q_SLOTS:
void onTypeChanged(const ParticipantManagement::Type &data, DataModification modType);
private:
NGL::INGLLogger &m_logger;
MainHandler* m_mainHandler;
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc; ///< Pointer to DTC ParticipantManagement interface object
NGL::INGLLogger &m_logger;
};
}
@@ -9,7 +9,7 @@
#pragma once
#include <NGLLogger/INGLLogger.h>
#include "svcwhgcommon_export.h"
#include "whg_export.h"
namespace WarehouseGuez
{
@@ -45,7 +45,6 @@ public:
std::shared_ptr<WsBaseDataInterface::WsBaseDataInterfaceHandler> wsBaseDataHandler() { return m_wsBaseDataHandler; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
std::shared_ptr<HandlerEquipmentTypeWh> m_handlerEquipTypeWh;
@@ -54,5 +53,7 @@ private:
std::shared_ptr<WsBaseDataInterface::WsBaseDataInterfaceHandler> m_wsBaseDataHandler;
std::shared_ptr<WsBiteInterface::WsBiteInterfaceHandler> m_wsBiteInterfaceHandler;
std::shared_ptr<WsBiteInterface::DataManager> m_wsBiteDataManager;
NGL::INGLLogger &m_logger;
};
} // namespace WarehouseGuez
@@ -12,6 +12,7 @@ namespace WarehouseGuez
ObjectEquipmentTypeWh::ObjectEquipmentTypeWh(MainHandler *mainHandler)
: m_mainHandler(mainHandler)
, m_logger(getLogger("ObjectEquipmentTypeWh"))
{
}
@@ -9,7 +9,7 @@
#include "logger.h"
#include "main_handler.h"
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h>
namespace WarehouseGuez
{
@@ -27,11 +27,11 @@ public:
Database::EquipmentTypeWh getData() const { return m_data; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
MainHandler *m_mainHandler;
Database::EquipmentTypeWh m_data;
NGL::INGLLogger &m_logger;
};
}
@@ -12,6 +12,7 @@ namespace WarehouseGuez
ObjectInjuryModel::ObjectInjuryModel(MainHandler *mainHandler)
: m_mainHandler(mainHandler)
, m_logger(getLogger("ObjectInjuryModel"))
{
}
@@ -9,7 +9,7 @@
#include "logger.h"
#include "main_handler.h"
#include <Core/core_types.h>
#include <DDS/Core/function_reply_object.h>
namespace WarehouseGuez
{
@@ -27,11 +27,11 @@ public:
Database::InjuryModelAgdusWh getData() const { return m_data; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
MainHandler *m_mainHandler;
Database::InjuryModelAgdusWh m_data;
NGL::INGLLogger &m_logger;
};
}
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QtCore/QString>
#include <QString>
namespace NGL
{