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
+4
-23
@@ -8,20 +8,17 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#if BUILD_RTI
|
||||
#include "dds_handler.h"
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#endif
|
||||
|
||||
namespace VideoOverlayManagement
|
||||
{
|
||||
|
||||
#if BUILD_RTI
|
||||
class HandlerInfrastructureData : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -59,8 +56,6 @@ private Q_SLOTS:
|
||||
void onAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType);
|
||||
|
||||
private: // methoden
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
/**
|
||||
* Returns the room id for the given assetId
|
||||
* @param[in] assetId Id of the asset to get the room id for
|
||||
@@ -77,22 +72,8 @@ private: // attributes
|
||||
QMap<int, QString> m_roomId2CameraNameMap; ///< Reference map roomId to camera name(roomId, cameraName) Condition: per room one camera!
|
||||
int m_exerciseId;
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
|
||||
};
|
||||
#else
|
||||
// Stub implementation when BUILD_RTI is disabled
|
||||
class HandlerInfrastructureData : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit HandlerInfrastructureData(QObject *parent = nullptr) : QObject(parent) {}
|
||||
~HandlerInfrastructureData() = default;
|
||||
bool init(int /*exerciseId*/) { return false; }
|
||||
bool isCameraAvailable(int /*roomId*/) const { return false; }
|
||||
QString getStreamNameFromRoomId(int /*roomId*/) const { return {}; }
|
||||
};
|
||||
#endif
|
||||
|
||||
} // namespace VideoOverlayManagement
|
||||
|
||||
Reference in new issue
Block a user