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:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
+12
-33
@@ -8,27 +8,22 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QObject>
|
||||
#include <QPointF>
|
||||
#include <QTimer>
|
||||
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include "GFS_map_cont.h"
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#endif
|
||||
|
||||
namespace GuezMinelayerProcessing
|
||||
{
|
||||
class DdsHandler;
|
||||
class ZSSI_WI_Minenfeld_Interpreter;
|
||||
|
||||
#if BUILD_RTI
|
||||
class HandlerMinelayerData : public QObject
|
||||
, protected AreaEffectSimulation::Interface::Ftc::MineAreaModifyFromCtaDataReplyHandler
|
||||
{
|
||||
@@ -43,14 +38,13 @@ public:
|
||||
void onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
|
||||
private slots:
|
||||
void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, ParticipantManagement::DataModification modType);
|
||||
void onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, ParticipantManagement::DataModification modType);
|
||||
void onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, ParticipantManagement::DataModification modType);
|
||||
void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType);
|
||||
void onMinelayerTrailerData(const TrainingAreaBase::MinelayerTrailerData &data, DataModification modType);
|
||||
void onMinelayerThrowerData(const TrainingAreaBase::MinelayerThrowerData &data, DataModification modType);
|
||||
void onSendMinefield(const wirkfeld_minensperre_rt &minefield, int fzArt);
|
||||
void onStartMinefieldInterpreter ();
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
template<typename T>
|
||||
void convertMinelayerDataToXdrData(const TrainingAreaBase::MinelayerTrailerData &inData, T &outData);
|
||||
Core::GeoPosition2D geographicFromRelative(const gps_position_rt &position) const;
|
||||
@@ -66,23 +60,8 @@ private:
|
||||
|
||||
ZSSI_WI_Minenfeld_Interpreter *m_minefieldInterpreter;
|
||||
QTimer *m_minefieldInterpreterTimer;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
#else
|
||||
// Stub implementation when BUILD_RTI is OFF
|
||||
class HandlerMinelayerData : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent = nullptr);
|
||||
~HandlerMinelayerData();
|
||||
|
||||
bool init() { return false; }
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
};
|
||||
#endif // BUILD_RTI
|
||||
|
||||
} // namespace GuezMinelayerProcessing
|
||||
Reference in new issue
Block a user