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
+6
-20
@@ -9,36 +9,32 @@
|
||||
#include "main_handler.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#endif
|
||||
|
||||
using namespace VideoOverlayManagement;
|
||||
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent)
|
||||
MainHandler::MainHandler(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_exerciseId(0)
|
||||
, m_avsIf(new AvsInterface(true, this))
|
||||
, m_avsConnectionState(AvsIfConnectionState::Undefined)
|
||||
#if BUILD_RTI
|
||||
, m_ddsHandler(nullptr)
|
||||
#endif
|
||||
, m_handlerParticipantData(nullptr)
|
||||
, m_handlerInfrastructureData(nullptr)
|
||||
, m_handlerOverlays(nullptr)
|
||||
, m_checkConnectTimer(new QTimer(this))
|
||||
, m_keepAliveTriggerTimer(new QTimer(this))
|
||||
, m_bAvsSocketWarnedOnce(false),
|
||||
m_logger(NGL::getMemoryLogger()) {
|
||||
, m_bAvsSocketWarnedOnce(false)
|
||||
, m_logger(getLogger("MainHandler"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
#if BUILD_RTI
|
||||
m_ddsHandler.reset();
|
||||
#endif
|
||||
} // end of dtor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -68,7 +64,6 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
connect(m_keepAliveTriggerTimer, &QTimer::timeout,
|
||||
this, &MainHandler::onSendKeepAlive);
|
||||
|
||||
#if BUILD_RTI
|
||||
// initialize DDS
|
||||
// for VideoOverlayManagement => exerciseId = partitionId
|
||||
m_ddsHandler.reset(new DdsHandler(domainId, exerciseId));
|
||||
@@ -99,7 +94,6 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Initialisation of OverlayHandler wait until AVS is connected
|
||||
connect(m_checkConnectTimer, &QTimer::timeout,
|
||||
@@ -107,9 +101,7 @@ bool MainHandler::init(int domainId, int exerciseId)
|
||||
m_checkConnectTimer->start(1000);
|
||||
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS may be still pending) ";
|
||||
#if BUILD_RTI
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
|
||||
#endif
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -138,16 +130,12 @@ bool MainHandler::onTryToInitOverlayHandler()
|
||||
if (!m_handlerOverlays->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerOverlays failed.";
|
||||
#if BUILD_RTI
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS established) ";
|
||||
#if BUILD_RTI
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
#endif
|
||||
|
||||
return true;
|
||||
} // end of onTryToInitOverlayHandler()
|
||||
@@ -170,9 +158,7 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
|
||||
case AvsIfConnectionState::ConnectionError:
|
||||
ERROR_LOG(m_logger) << "AvsIfConnectionState::ConnectionError !";
|
||||
m_keepAliveTriggerTimer->stop();
|
||||
#if BUILD_RTI
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
|
||||
#endif
|
||||
break;
|
||||
case AvsIfConnectionState::Undefined:
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user