Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
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:
1718 files changed
+126739
-18495
No files matched your search
@@ -191,6 +191,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExerciseManagement
|
||||
ngltools
|
||||
ProjectConfig
|
||||
Qt6::Core
|
||||
$<IF:$<TARGET_EXISTS:Qt6::StateMachine>,Qt6::StateMachine,>
|
||||
svcCoreClient
|
||||
svcExmCommon
|
||||
svcExmServer
|
||||
|
||||
+1
@@ -51,6 +51,7 @@ IF(BUILD_TESTING AND TARGET svcExmClient)
|
||||
ngltools
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
$<IF:$<TARGET_EXISTS:Qt6::StateMachine>,Qt6::StateMachine,>
|
||||
svcCoreClient
|
||||
svcExmCommon
|
||||
svcExmServer
|
||||
|
||||
+6
-6
@@ -106,7 +106,7 @@ void StateMachineTest::initTestCase()
|
||||
void StateMachineTest::staticTests()
|
||||
{
|
||||
// newly created, nothing set -> Status should be ExerciseState::Created
|
||||
QCOMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Created);
|
||||
QCOMPARE(m_exmObject->exerciseState(), ExerciseState::Created);
|
||||
}
|
||||
|
||||
void StateMachineTest::dynamicTests()
|
||||
@@ -116,35 +116,35 @@ void StateMachineTest::dynamicTests()
|
||||
// Switch to STARTED
|
||||
m_exmObject->switchToState(ExerciseState::Started, 0, 0);
|
||||
|
||||
QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Started);
|
||||
QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Started);
|
||||
QCOMPARE(spy.count(), 1); // Started
|
||||
spy.clear();
|
||||
|
||||
// => PAUSED
|
||||
m_exmObject->switchToState(ExerciseState::Paused, 99, 10);
|
||||
|
||||
QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Paused);
|
||||
QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Paused);
|
||||
QCOMPARE(spy.count(), 1); // PAUSED
|
||||
spy.clear();
|
||||
|
||||
// Try to (re)start
|
||||
m_exmObject->switchToState(ExerciseState::Started, 99, 10);
|
||||
|
||||
QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Started);
|
||||
QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Started);
|
||||
QCOMPARE(spy.count(), 1); // Started (Resumed)
|
||||
spy.clear();
|
||||
|
||||
// => Stopped
|
||||
m_exmObject->switchToState(ExerciseState::Stopped, 99, 10);
|
||||
|
||||
QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Stopped);
|
||||
QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Stopped);
|
||||
QCOMPARE(spy.count(), 1); // Stopped
|
||||
spy.clear();
|
||||
|
||||
// => Terminated
|
||||
m_exmObject->switchToState(ExerciseState::Terminated, 99, 10);
|
||||
|
||||
QTRY_COMPARE(m_exmObject->exerciseState().underlying(), ExerciseState::Terminated);
|
||||
QTRY_COMPARE(m_exmObject->exerciseState(), ExerciseState::Terminated);
|
||||
QCOMPARE(spy.count(), 1); // Terminated
|
||||
spy.clear();
|
||||
}
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ namespace ExerciseManagement
|
||||
return tr("TERMINATED");
|
||||
}
|
||||
|
||||
return tr("Unknown State: (%1)").arg(state);
|
||||
return tr("Unknown State: (%1)").arg(static_cast<int>(state));
|
||||
}
|
||||
|
||||
void ExerciseStateManager::setStateInternal(ExerciseManagement::ExerciseState state)
|
||||
|
||||
@@ -175,7 +175,7 @@ static Database::ExmExercise copyBaseData(const T &in)
|
||||
newData.startTime = QDateTime::fromMSecsSinceEpoch(in.startTime);
|
||||
newData.stopTime = QDateTime::fromMSecsSinceEpoch(in.stopTime);
|
||||
newData.trainingAreaId = in.trainingAreaId;
|
||||
if (in.radioGroupId.is_set())
|
||||
if (in.radioGroupId.has_value())
|
||||
newData.radioGroupId = in.radioGroupId.get();
|
||||
newData.symbolFillTypeId = in.symbolFillTypeId;
|
||||
newData.linkedExerciseId = in.linkedExerciseId;
|
||||
@@ -693,7 +693,7 @@ bool HandlerExercise::checkEquipmentNumbersOnAllExercises(int exerciseIdToBeStar
|
||||
|
||||
const auto cb = [&eqNoForEx](const ParticipantManagement::Participant &data) -> void
|
||||
{
|
||||
if (data.equipmentNumber.is_set())
|
||||
if (data.equipmentNumber.has_value())
|
||||
eqNoForEx.insert(data.equipmentNumber.get());
|
||||
};
|
||||
ppmDtcForEx->participants(cb);
|
||||
@@ -793,7 +793,7 @@ QStringList HandlerExercise::doubleChannels(int exerciseAId, int exerciseBId) co
|
||||
|
||||
for (auto it = cnrConfigs.constBegin(); it != cnrConfigs.constEnd(); ++it)
|
||||
{
|
||||
int cnrExerciseId = it.value().exerciseId.is_set() ? it.value().exerciseId.get() : 0;
|
||||
int cnrExerciseId = it.value().exerciseId.has_value() ? it.value().exerciseId.get() : 0;
|
||||
|
||||
if (cnrExerciseId == exerciseAId)
|
||||
{
|
||||
|
||||
@@ -293,7 +293,7 @@ Core::FunctionReplyObject ObjectExercise::switchToState(const ExerciseState &new
|
||||
bool ok = m_stateMachine->switchToState(newExerciseState);
|
||||
if (!ok)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error switching to state %1")).arg(newExerciseState.underlying());
|
||||
ret = Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error switching to state %1")).arg(static_cast<int>(newExerciseState));
|
||||
}
|
||||
NOTICE_LOG(m_logger) << "-------------- after switch: currentState" << m_stateMachine->getCurrentState();
|
||||
NOTICE_LOG(m_logger) << "-> OperatorId: " << m_data.operatorId << ", workstationId: " << m_data.workstationId;
|
||||
@@ -304,7 +304,7 @@ static int s_requestId = 0;
|
||||
bool ObjectExercise::sendStateToServiceManagement(ExerciseState state)
|
||||
{
|
||||
Core::ServiceGroupType sgt = Core::ServiceGroupType::Core; // invalid here
|
||||
switch (state.underlying())
|
||||
switch (state)
|
||||
{
|
||||
case ExerciseState::Created:
|
||||
sgt = Core::ServiceGroupType::ExercisePreparation;
|
||||
|
||||
Reference in new issue
Block a user