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
+4
-5
@@ -869,15 +869,14 @@ void ModuleTestEffectCluster::initTestCase()
|
||||
// this, &ModuleTestEffectCluster::onParticipantChanged);
|
||||
connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::partyChanged, this, &ModuleTestEffectCluster::onPartyChanged);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::aesItemViewChanged, this, &ModuleTestEffectCluster::onAesItemViewChanged, Qt::UniqueConnection);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::aesItemViewChanged, this, &ModuleTestEffectCluster::onAesItemViewChanged);
|
||||
connect(m_aesDtc.get(),
|
||||
&AreaEffectSimulation::Interface::Dtc::trajectoryTimeAwareChanged,
|
||||
this,
|
||||
&ModuleTestEffectCluster::onTrajectoryTimeAwareChanged,
|
||||
Qt::UniqueConnection);
|
||||
&ModuleTestEffectCluster::onTrajectoryTimeAwareChanged);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::effectsChanged, this, &ModuleTestEffectCluster::onEffectsChanged, Qt::UniqueConnection);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::chargeEffectChanged, this, &ModuleTestEffectCluster::onChargeEffectChanged, Qt::UniqueConnection);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::effectsChanged, this, &ModuleTestEffectCluster::onEffectsChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::chargeEffectChanged, this, &ModuleTestEffectCluster::onChargeEffectChanged);
|
||||
|
||||
// spend some for the eventLoop to "consume" existing topics/samples:
|
||||
for (int i = 0; i < 10; ++i)
|
||||
|
||||
+5
-5
@@ -1102,7 +1102,7 @@ void ModuleTestExplosionCluster::initTestCase()
|
||||
QVERIFY2(bRet, "ERROR, enableAll failed!!");
|
||||
|
||||
connect(m_bldDtc.get(), &Buildings::Interface::Dtc::buildingStateChanged,
|
||||
this, &ModuleTestExplosionCluster::onBuildingStateChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestExplosionCluster::onBuildingStateChanged);
|
||||
|
||||
//
|
||||
// ISM
|
||||
@@ -1150,15 +1150,15 @@ void ModuleTestExplosionCluster::initTestCase()
|
||||
|
||||
// connect at the end to skip unwanted
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::explosionClusterChanged,
|
||||
this, &ModuleTestExplosionCluster::onExplosionClusterChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestExplosionCluster::onExplosionClusterChanged);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::aesItemViewChanged,
|
||||
this, &ModuleTestExplosionCluster::onAesItemViewChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestExplosionCluster::onAesItemViewChanged);
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::trajectoryTimeAwareChanged,
|
||||
this, &ModuleTestExplosionCluster::onTrajectoryTimeAwareChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestExplosionCluster::onTrajectoryTimeAwareChanged);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::effectsChanged,
|
||||
this, &ModuleTestExplosionCluster::onEffectsChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestExplosionCluster::onEffectsChanged);
|
||||
|
||||
// spend some for the eventLoop to "consume" existing topics/samples:
|
||||
for (int i = 0; i<10; ++i)
|
||||
|
||||
+3
-3
@@ -506,13 +506,13 @@ void ModuleTestAesOthers::initTestCase()
|
||||
|
||||
// connect at the end to skip unwanted
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged,
|
||||
this, &ModuleTestAesOthers::boobyTrapChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestAesOthers::boobyTrapChanged);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged,
|
||||
this, &ModuleTestAesOthers::offRouteMineChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestAesOthers::offRouteMineChanged);
|
||||
|
||||
connect(m_aesDtc.get(), &AreaEffectSimulation::Interface::Dtc::aesItemViewChanged,
|
||||
this, &ModuleTestAesOthers::onAesItemViewChanged, Qt::UniqueConnection);
|
||||
this, &ModuleTestAesOthers::onAesItemViewChanged);
|
||||
|
||||
// spend some for the eventLoop to "consume" existing topics/samples:
|
||||
for (int i = 0; i < 10; ++i)
|
||||
|
||||
+16
-16
@@ -134,12 +134,12 @@ void TestFireAutomaton::testScheduling(int32_t time, FireAutomaton::TimeType typ
|
||||
FireAutomaton automaton;
|
||||
QVERIFY(automaton.init(time, type, numberOfRounds, effectorIds, pattern));
|
||||
|
||||
QSignalSpy spyFire(&automaton, SIGNAL(fire(int32_t)));
|
||||
QSignalSpy spyFire(&automaton, &FireAutomaton::fire);
|
||||
QVERIFY(spyFire.isValid());
|
||||
|
||||
QSignalSpy spyFinished(&automaton, SIGNAL(finished()));
|
||||
|
||||
QSignalSpy spyFinished(&automaton, &FireAutomaton::finished);
|
||||
QVERIFY(spyFinished.isValid());
|
||||
|
||||
|
||||
connect(&automaton, &FireAutomaton::fire, this, &TestFireAutomaton::fireReceived);
|
||||
|
||||
qint64 startTimeMSecs = QDateTime::currentMSecsSinceEpoch();
|
||||
@@ -207,9 +207,9 @@ void TestFireAutomaton::testStepping(int32_t numberOfRounds, const QVector<int32
|
||||
{
|
||||
FireAutomaton automaton;
|
||||
QVERIFY(automaton.init(0, FireAutomaton::TimeType::Cadence, numberOfRounds, effectorIds, pattern));
|
||||
QSignalSpy spyFire(&automaton, SIGNAL(fire(int32_t)));
|
||||
QSignalSpy spyFire(&automaton, &FireAutomaton::fire);
|
||||
QVERIFY(spyFire.isValid());
|
||||
QSignalSpy spyFinished(&automaton, SIGNAL(finished()));
|
||||
QSignalSpy spyFinished(&automaton, &FireAutomaton::finished);
|
||||
QVERIFY(spyFinished.isValid());
|
||||
connect(&automaton, &FireAutomaton::fire, this, &TestFireAutomaton::fireReceived);
|
||||
|
||||
@@ -267,11 +267,11 @@ void TestFireAutomaton::testResumePaused()
|
||||
|
||||
FireAutomaton automaton;
|
||||
QVERIFY(automaton.init(effectDurationMSecs, FireAutomaton::TimeType::Duration, numberOfRounds, effectorIds, QStringLiteral("all*")));
|
||||
|
||||
QSignalSpy spyFire(&automaton, SIGNAL(fire(int32_t)));
|
||||
|
||||
QSignalSpy spyFire(&automaton, &FireAutomaton::fire);
|
||||
QVERIFY(spyFire.isValid());
|
||||
|
||||
QSignalSpy spyFinished(&automaton, SIGNAL(finished()));
|
||||
|
||||
QSignalSpy spyFinished(&automaton, &FireAutomaton::finished);
|
||||
QVERIFY(spyFinished.isValid());
|
||||
|
||||
qint64 startTimeMSecs = QDateTime::currentMSecsSinceEpoch();
|
||||
@@ -309,11 +309,11 @@ void TestFireAutomaton::testStop()
|
||||
QVERIFY(automaton.init(effectDurationMSecs, FireAutomaton::TimeType::Duration, numberOfRounds, effectorIds, QStringLiteral("next*")));
|
||||
|
||||
QTest::qWait(10);
|
||||
|
||||
QSignalSpy spyFire(&automaton, SIGNAL(fire(int32_t)));
|
||||
|
||||
QSignalSpy spyFire(&automaton, &FireAutomaton::fire);
|
||||
QVERIFY(spyFire.isValid());
|
||||
|
||||
QSignalSpy spyFinished(&automaton, SIGNAL(finished()));
|
||||
|
||||
QSignalSpy spyFinished(&automaton, &FireAutomaton::finished);
|
||||
QVERIFY(spyFinished.isValid());
|
||||
|
||||
QVERIFY(automaton.start());
|
||||
@@ -344,9 +344,9 @@ void TestFireAutomaton::testStates()
|
||||
|
||||
FireAutomaton automaton;
|
||||
|
||||
QSignalSpy spyFinished(&automaton, SIGNAL(finished()));
|
||||
QSignalSpy spyFinished(&automaton, &FireAutomaton::finished);
|
||||
QVERIFY(spyFinished.isValid());
|
||||
|
||||
|
||||
// init
|
||||
QCOMPARE(automaton.getState(), FireAutomaton::State::Uninitialized);
|
||||
QVERIFY(!automaton.start());
|
||||
|
||||
-1
@@ -8,7 +8,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <QtCore>
|
||||
#include <QMetaType>
|
||||
|
||||
#include <AreaEffectSimulation/Utils/fire_automaton.h>
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ FireAutomaton::FireAutomaton(QObject *parent)
|
||||
, m_logger(getLogger("Utils.FireAutomaton"))
|
||||
{
|
||||
m_timer.setSingleShot(true);
|
||||
connect(&m_timer, &QTimer::timeout, this, &FireAutomaton::nextTick, Qt::UniqueConnection);
|
||||
connect(&m_timer, &QTimer::timeout, this, &FireAutomaton::nextTick);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
-1
@@ -5,7 +5,6 @@
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include <QtCore>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QString>
|
||||
|
||||
+2
-2
@@ -177,7 +177,7 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
|
||||
d->m_firingTimer->setSingleShot(false);
|
||||
d->m_firingTimer->setInterval(d->m_intervallMsec);
|
||||
connect(d->m_firingTimer, &QTimer::timeout,
|
||||
this, &FiringTimer::onFiringTimout, Qt::UniqueConnection);
|
||||
this, &FiringTimer::onFiringTimout);
|
||||
|
||||
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
|
||||
return true;
|
||||
@@ -460,7 +460,7 @@ void FiringTimer::onFiringTimout()
|
||||
// : maybe use disconnect via QMetaObject
|
||||
|
||||
connect(d->m_firingTimer, &QTimer::timeout,
|
||||
this, &FiringTimer::onFiringTimoutExpiredPlus, Qt::UniqueConnection);
|
||||
this, &FiringTimer::onFiringTimoutExpiredPlus);
|
||||
|
||||
d->m_firingTimer->setSingleShot(true);
|
||||
d->m_firingTimer->start();
|
||||
|
||||
+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)
|
||||
|
||||
+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);
|
||||
}
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ Core::FunctionReplyObject ObjectFunctionalArea::createObject(const Database::Aes
|
||||
m_timer = new QTimer(this);
|
||||
|
||||
connect(m_timer, &QTimer::timeout,
|
||||
this, &ObjectFunctionalArea::myTimerSlot, Qt::UniqueConnection);
|
||||
this, &ObjectFunctionalArea::myTimerSlot);
|
||||
|
||||
DEBUG_LOG(m_logger) << "connect participantPositionChanged";
|
||||
connect(m_mainHandler->dds()->ppmDtc().get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged,
|
||||
|
||||
Reference in new issue
Block a user