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
+6
-6
@@ -1815,10 +1815,10 @@ void ObjectExplosionCluster::checkNextFire()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " " << m_data.id << " startFiring (no delay)";
|
||||
|
||||
// // connect(&m_firingTimer, &FiringTimer::firing, this, &ObjectExplosionCluster::onFiringTimerFiring, Qt::UniqueConnection);
|
||||
connect(&m_firingTimer, &FiringTimer::impact, this, &ObjectExplosionCluster::onFiringTimerImpact, Qt::UniqueConnection);
|
||||
// // connect(&m_firingTimer, &FiringTimer::firing, this, &ObjectExplosionCluster::onFiringTimerFiring);
|
||||
connect(&m_firingTimer, &FiringTimer::impact, this, &ObjectExplosionCluster::onFiringTimerImpact);
|
||||
// // connect(&m_firingTimer, &FiringTimer::stateChangeDelayedAsInt,
|
||||
// // this, &ObjectExplosionCluster::onFiringTimerStateChangeDelayedCommandAsInt, Qt::UniqueConnection);
|
||||
// // this, &ObjectExplosionCluster::onFiringTimerStateChangeDelayedCommandAsInt);
|
||||
|
||||
m_firingTimer.startFiring();
|
||||
}
|
||||
@@ -1827,9 +1827,9 @@ void ObjectExplosionCluster::checkNextFire()
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " " << m_data.id << " trigger startFiringDelay, delay " << delay;
|
||||
|
||||
connect(&m_firingTimer, &FiringTimer::firing, this, &ObjectExplosionCluster::onFiringTimerFiring, Qt::UniqueConnection);
|
||||
connect(&m_firingTimer, &FiringTimer::impact, this, &ObjectExplosionCluster::onFiringTimerImpact, Qt::UniqueConnection);
|
||||
connect(&m_firingTimer, &FiringTimer::stateChangeDelayedAsInt, this, &ObjectExplosionCluster::onFiringTimerStateChangeDelayedCommandAsInt, Qt::UniqueConnection);
|
||||
connect(&m_firingTimer, &FiringTimer::firing, this, &ObjectExplosionCluster::onFiringTimerFiring);
|
||||
connect(&m_firingTimer, &FiringTimer::impact, this, &ObjectExplosionCluster::onFiringTimerImpact);
|
||||
connect(&m_firingTimer, &FiringTimer::stateChangeDelayedAsInt, this, &ObjectExplosionCluster::onFiringTimerStateChangeDelayedCommandAsInt);
|
||||
|
||||
m_firingTimer.startFiringDelay(delay);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user