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

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseWatch/exm_watch_gui_plugin.cpp
+21 -21
View File
@@ -64,7 +64,7 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
LtsWidgets::ExcState InterfaceImpl::convertState(ExerciseState state)
{
int underlying = state.underlying() - 1;
int underlying = static_cast<int>(state) - 1;
if (underlying >= 0)
{
int i_state = (1 << static_cast<int>(underlying));
@@ -81,7 +81,7 @@ void InterfaceImpl::clearInterfaces()
QColor InterfaceImpl::exerciseStateColor(ExerciseManagement::ExerciseState state)
{
switch(state.underlying())
switch(state)
{
case ExerciseState::Unknown: return Qt::black;
case ExerciseState::Created: return Qt::cyan;
@@ -95,18 +95,18 @@ QColor InterfaceImpl::exerciseStateColor(ExerciseManagement::ExerciseState state
void InterfaceImpl::slotExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this << ", exId=" << data.id();
TRACE_LOG(m_logger) << LOGFUNCTION << " START, this=" << this << ", exId=" << data.id;
if (m_isDeleted)
return;
if (data.id() != m_session->exerciseId())
if (data.id != m_session->exerciseId())
return;
switch (modType)
{
case DataModification::eRemoved:
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " eRemoved" << ", this=" << this << ", exId=" << data.id();
DEBUG_LOG(m_logger) << LOGFUNCTION << " eRemoved" << ", this=" << this << ", exId=" << data.id;
m_previouslyRemoved = true;
WARNING_LOG(m_logger) << "Partition has been removed from the DDS bus! Session: " << m_session->toString();
if (m_session->baseLayout())
@@ -118,7 +118,7 @@ void InterfaceImpl::slotExerciseChanged(const ExerciseManagement::Exercise &data
{
WARNING_LOG(m_logger) << LOGFUNCTION << ", Partition added to DDS bus! Session: " << m_session->toString();
DEBUG_LOG(m_logger) << LOGFUNCTION << " eAdded, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id();
DEBUG_LOG(m_logger) << LOGFUNCTION << " eAdded, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id;
if (m_previouslyRemoved)
{
m_previouslyRemoved = false;
@@ -130,12 +130,12 @@ void InterfaceImpl::slotExerciseChanged(const ExerciseManagement::Exercise &data
case DataModification::eModified:
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " eModified, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id();
DEBUG_LOG(m_logger) << LOGFUNCTION << " eModified, m_previouslyRemoved=" << m_previouslyRemoved << ", this=" << this << ", exId=" << data.id;
slotSetExerciseData();
break;
}
}
TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this << ", exId=" << data.id();
TRACE_LOG(m_logger) << LOGFUNCTION << " END, this=" << this << ", exId=" << data.id;
}
@@ -145,8 +145,8 @@ void InterfaceImpl::slotExercisePhaseChanged(const ExerciseManagement::ExerciseP
if (m_isDeleted)
return;
if (data.exerciseId() != m_session->exerciseId() ||
data.id() != m_session->exerciseData()->phId)
if (data.exerciseId != m_session->exerciseId() ||
data.id != m_session->exerciseData()->phId)
return;
slotExerciseChanged(m_dtc->exercise(m_session->exerciseId()), DataModification::eModified);
@@ -193,25 +193,25 @@ void InterfaceImpl::slotSetExerciseData()
const ExerciseManagement::Exercise &ex = m_dtc->exercise(m_session->exerciseId());
if (ex.id() != m_session->exerciseId())
if (ex.id != m_session->exerciseId())
FATAL_LOG(m_logger) << LOGFUNCTION << ", requested exId and return exId do not match!!!";
const ExerciseManagement::ExercisePhase &ph = m_dtc->exercisePhase(ex.activePhaseId());
const ExerciseManagement::ExercisePhase &ph = m_dtc->exercisePhase(ex.activePhaseId);
exData.exName = QString::fromStdString(ex.name());
exData.exDescription = QString::fromStdString(ex.description());
exData.exStateString = ExerciseManagement::toString(ex.state());
exData.exState = convertState(ex.state());
exData.exStateCol = exerciseStateColor(ex.state());
exData.exName = QString::fromStdString(ex.name);
exData.exDescription = QString::fromStdString(ex.description);
exData.exStateString = ExerciseManagement::toString(ex.state);
exData.exState = convertState(ex.state);
exData.exStateCol = exerciseStateColor(ex.state);
exData.partitionType = partitionTypeString();
exData.phId = ph.id();
exData.phName = QString::fromStdString(ph.name());
exData.phDescription = QString::fromStdString(ph.description());
exData.phId = ph.id;
exData.phName = QString::fromStdString(ph.name);
exData.phDescription = QString::fromStdString(ph.description);
m_session->setExerciseData(exData);
DTG::setTimezone(ex.defaultTimeZone(), false);
DTG::setTimezone(ex.defaultTimeZone, false);
}
}