Lts/Services: finalize Qt6/C++17 migration cleanup
Remove deprecated Qt5 patterns remaining in Services: - Replace remaining SIGNAL/SLOT string syntax with function pointer syntax (NmeaManagement/socket_handler.cpp, AudioVideoManagement/ModuleTests/mvs_tests.cpp) - Remove Qt::UniqueConnection (deprecated in Qt6, default behavior) from 19 files across AES, CES plugins, and cross-services (47 occurrences) - Remove umbrella #include <QtCore> from fire_automaton.h and aes_test_fire_automaton.h (specific includes suffice) 25 files changed, 74 insertions(+), 81 deletions(-)
This commit is contained in:
1 parent
29002f2a48
commit
5485a90385
25 files changed
+74
-81
No files matched your search
+7
-9
@@ -3282,8 +3282,7 @@ bool ObjectEffectCluster::sendFireCommand(int participantId)
|
||||
connect(m_mainHandler->chargeEffectHandler().get(),
|
||||
&AreaEffectSimulation::HandlerChargeEffect::chargeEffectActive,
|
||||
this,
|
||||
&ObjectEffectCluster::onChargeEffectChanged,
|
||||
Qt::UniqueConnection);
|
||||
&ObjectEffectCluster::onChargeEffectChanged);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -3366,8 +3365,7 @@ bool ObjectEffectCluster::overrideEffectorStates(const AesEffectorState &newStat
|
||||
connect(m_mainHandler->chargeEffectHandler().get(),
|
||||
&AreaEffectSimulation::HandlerChargeEffect::chargeEffectActive,
|
||||
this,
|
||||
&ObjectEffectCluster::onChargeEffectChanged,
|
||||
Qt::UniqueConnection);
|
||||
&ObjectEffectCluster::onChargeEffectChanged);
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
@@ -3454,11 +3452,11 @@ bool ObjectEffectCluster::assignEffector(int participantId)
|
||||
return true;
|
||||
}
|
||||
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalFired, this, &ObjectEffectCluster::onEffectorFired, Qt::UniqueConnection);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalNotReadyToFire, this, &ObjectEffectCluster::onEffectorNotReadyToFire, Qt::UniqueConnection);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalReadyToFire, this, &ObjectEffectCluster::onEffectorReadyToFire, Qt::UniqueConnection);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalReceivedOrder, this, &ObjectEffectCluster::onEffectorReceivedOrder, Qt::UniqueConnection);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalReportedFired, this, &ObjectEffectCluster::onEffectorReportedFired, Qt::UniqueConnection);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalFired, this, &ObjectEffectCluster::onEffectorFired);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalNotReadyToFire, this, &ObjectEffectCluster::onEffectorNotReadyToFire);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalReadyToFire, this, &ObjectEffectCluster::onEffectorReadyToFire);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalReceivedOrder, this, &ObjectEffectCluster::onEffectorReceivedOrder);
|
||||
connect(effector, &AreaEffectSimulation::ObjectEffector::signalReportedFired, this, &ObjectEffectCluster::onEffectorReportedFired);
|
||||
effector->assignAesItemRequest(m_data.id);
|
||||
|
||||
if (cadence > 0)
|
||||
|
||||
Reference in new issue
Block a user