lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrates Pacemaker to CorePortType and plain generated members

Browse Source
This commit is contained in:
berrux-dev committed 2026-09-18 17:45:16 +02:00
1 parent 35bfe2be39
commit 15a961182a
2 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp
+9 -9
View File
@@ -15,7 +15,7 @@ namespace Core
{ {
Pacemaker::Pacemaker(DDSConnector::DdsConnector *ddsConnector) Pacemaker::Pacemaker(DDSConnector::DdsConnector *ddsConnector)
: QObject(nullptr) : QObject(nullptr)
, m_logger(NGL::INGLLoggerBootstrap::getNGLLogger("Core.Pacemaker")) , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Core.Pacemaker"))
{ {
init(ddsConnector); init(ddsConnector);
} }
@@ -40,11 +40,11 @@ void Pacemaker::setNewState(Core::RunningState newState, const QString& errorStr
void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString& errorString) void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString& errorString)
{ {
m_state.runningState(newState); m_state.runningState = newState;
if (errorString.isEmpty()) if (errorString.isEmpty())
m_state.errorString().reset(); m_state.errorString.reset();
else else
m_state.errorString(errorString.toStdString()); m_state.errorString = errorString.toStdString();
publishState(); publishState();
} }
@@ -59,9 +59,9 @@ void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, cons
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties) void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
{ {
if (!m_state.ports().is_set()) if (!m_state.ports.is_set())
m_state.ports() = std::vector<Core::PortInformation>(); m_state.ports = std::vector<Core::PortInformation>();
m_state.ports().get().push_back(Core::PortInformation(number, portType, properties.toStdString())); m_state.ports.get().push_back(Core::PortInformation(number, portType, properties.toStdString()));
publishState(); publishState();
} }
@@ -81,8 +81,8 @@ void Pacemaker::init(DDSConnector::DdsConnector* ddsConnector)
WARNING_LOG(m_logger) << "Can not initialize DTS::CurrentRunningState!"; WARNING_LOG(m_logger) << "Can not initialize DTS::CurrentRunningState!";
return; return;
} }
m_state.pid(QCoreApplication::applicationPid()); m_state.pid = QCoreApplication::applicationPid();
m_state.runningState(Core::RunningState::Starting); m_state.runningState = Core::RunningState::Starting;
m_paceThread = new QThread; m_paceThread = new QThread;
this->moveToThread(m_paceThread); this->moveToThread(m_paceThread);
qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.h
+2 -2
View File
@@ -40,7 +40,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
void setNewState(Core::RunningState newState, const QString &errorString = QString()); void setNewState(Core::RunningState newState, const QString &errorString = QString());
void addPort(unsigned short number, Core::PortType portType, const QString &properties = QStringLiteral("")); void addPort(unsigned short number, Core::CorePortType portType, const QString &properties = QStringLiteral(""));
// only public for special purposes, not needed to call explicitly by default // only public for special purposes, not needed to call explicitly by default
void publishState(); void publishState();
@@ -48,7 +48,7 @@ public Q_SLOTS:
private: private:
void init(DDSConnector::DdsConnector *ddsConnector); void init(DDSConnector::DdsConnector *ddsConnector);
void setNewStateInternal(Core::RunningState newState, const QString &errorString = QString()); void setNewStateInternal(Core::RunningState newState, const QString &errorString = QString());
void addPortInternal(unsigned short number, Core::PortType portType, const QString &properties = QStringLiteral("")); void addPortInternal(unsigned short number, Core::CorePortType portType, const QString &properties = QStringLiteral(""));
private: private:
static constexpr const int m_publishTimerDelay = 3000; static constexpr const int m_publishTimerDelay = 3000;