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
+7
-8
@@ -7,11 +7,10 @@
|
||||
*/
|
||||
|
||||
#include "handler_overlays.h"
|
||||
#include <utility>
|
||||
#include "handler_participant_data.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QByteArray>
|
||||
|
||||
using namespace VideoOverlayManagement;
|
||||
|
||||
@@ -19,12 +18,14 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
|
||||
const std::shared_ptr<HandlerParticipantData> &handlerParticipantData,
|
||||
const std::shared_ptr<HandlerInfrastructureData> &handlerInfrastructureData,
|
||||
int exerciseId,
|
||||
QObject *parent) : QObject(parent)
|
||||
QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_avsIf(avsIf)
|
||||
, m_handlerParticipantData(handlerParticipantData)
|
||||
, m_handlerInfrastructureData(handlerInfrastructureData)
|
||||
, m_exerciseId(exerciseId),
|
||||
m_logger(NGL::getMemoryLogger()) {
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_logger(getLogger("HandlerOverlays"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -43,11 +44,9 @@ bool HandlerOverlays::init()
|
||||
|
||||
// Get assigned participants to roomId data from Player Management ...
|
||||
initParticipantsInRoomMap();
|
||||
#if BUILD_RTI
|
||||
// Subscribe for external changes
|
||||
connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
|
||||
this, &HandlerOverlays::onParticipantPositionChanged);
|
||||
#endif
|
||||
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. ";
|
||||
|
||||
@@ -228,7 +227,7 @@ QString HandlerOverlays::getAllEquipmentNumbers(QSet<int> data, bool isParticipa
|
||||
if (isParticipantIds)
|
||||
data = convertParticipantIdsToEquipmentNo(data);
|
||||
|
||||
for (int currentDataId : std::as_const(data))
|
||||
for (int currentDataId : qAsConst(data))
|
||||
{
|
||||
qs.append(QString::number(currentDataId));
|
||||
qs.append(QLatin1String(", "));
|
||||
|
||||
Reference in new issue
Block a user