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
+2
-2
@@ -68,11 +68,11 @@ bool HandlerAesData::init()
|
||||
|
||||
dtcAes->enableEffects();
|
||||
connect(dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::effectsChanged,
|
||||
this, &HandlerAesData::onEffectsChanged, Qt::UniqueConnection);
|
||||
this, &HandlerAesData::onEffectsChanged);
|
||||
|
||||
dtcAes->enableBoobyTrap();
|
||||
connect(dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::boobyTrapChanged,
|
||||
this, &HandlerAesData::onBoobyTrapChanged, Qt::UniqueConnection);
|
||||
this, &HandlerAesData::onBoobyTrapChanged);
|
||||
|
||||
// Get 'static' data for all AesItemView
|
||||
{
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ bool HandlerExplosions::init()
|
||||
this, &HandlerExplosions::onExplosionSingleChanged);
|
||||
dtcAes->enableEffects();
|
||||
connect(dtcAes.get(), &AreaEffectSimulation::Interface::Dtc::effectsChanged,
|
||||
this, &HandlerExplosions::onEffectsChanged, Qt::UniqueConnection);
|
||||
this, &HandlerExplosions::onEffectsChanged);
|
||||
|
||||
connect(m_handlerParticipant.get(), &CentralEffectSimulation::HandlerParticipant::newOutdoorPosition,
|
||||
this, &HandlerExplosions::onNewParticipantCesPosition);
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ void CesMissionPlanHandler::updateMissionPlanList(const ParticipantManagement::M
|
||||
|
||||
obj = new CesMissionPlanObject(data, m_ddsHandler, this);
|
||||
connect(obj, &CesMissionPlanObject::ready2SendNextAction, this,
|
||||
&CesMissionPlanHandler::onSendNextMissionAction, Qt::UniqueConnection);
|
||||
&CesMissionPlanHandler::onSendNextMissionAction);
|
||||
|
||||
const int planId = obj->planId();
|
||||
std::function<void(void)> onDeleteObj = [this, planId]()
|
||||
|
||||
+1
-2
@@ -20,8 +20,7 @@ TargetTimer::TargetTimer(int participantId,
|
||||
m_preWarningInterval = preWarningInterval;
|
||||
m_timeToEffectInterval = timeToEffectInterval;
|
||||
timer = new QTimer(this);
|
||||
connect(timer, SIGNAL(timeout()),
|
||||
this, SLOT(MyTimerSlot()));
|
||||
connect(timer, &QTimer::timeout, this, &TargetTimer::MyTimerSlot);
|
||||
|
||||
// msec
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user