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

Adds ktexttemplate as apt package to new_docker_build.sh and builds successfully

Browse Source
This commit is contained in:
torsten committed 2026-09-21 15:43:39 +02:00
1 parent 9e38583785
commit 7cd3e43959
39 files changed
+647 -208
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)
: QObject(nullptr)
, m_logger(NGL::INGLLoggerBootstrap::getNGLLogger("Core.Pacemaker"))
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Core.Pacemaker"))
{
init(ddsConnector);
}
@@ -40,11 +40,11 @@ void Pacemaker::setNewState(Core::RunningState newState, const QString& errorStr
void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString& errorString)
{
m_state.runningState(newState);
m_state.runningState = newState;
if (errorString.isEmpty())
m_state.errorString().reset();
m_state.errorString.reset();
else
m_state.errorString(errorString.toStdString());
m_state.errorString = errorString.toStdString();
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)
{
if (!m_state.ports().is_set())
m_state.ports() = std::vector<Core::PortInformation>();
m_state.ports().get().push_back(Core::PortInformation(number, portType, properties.toStdString()));
if (!m_state.ports.has_value())
m_state.ports = std::vector<Core::PortInformation>();
m_state.ports.value().push_back(Core::PortInformation(number, portType, properties.toStdString()));
publishState();
}
@@ -81,8 +81,8 @@ void Pacemaker::init(DDSConnector::DdsConnector* ddsConnector)
WARNING_LOG(m_logger) << "Can not initialize DTS::CurrentRunningState!";
return;
}
m_state.pid(QCoreApplication::applicationPid());
m_state.runningState(Core::RunningState::Starting);
m_state.pid = QCoreApplication::applicationPid();
m_state.runningState = Core::RunningState::Starting;
m_paceThread = new QThread;
this->moveToThread(m_paceThread);