lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lts/Services: finalize Qt6/C++17 migration cleanup

Browse Source 
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:
berrux-dev committed 2026-09-21 06:43:28 +00:00
1 parent 29002f2a48
commit 5485a90385
25 files changed
+74 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.cpp
+16 -16
View File
@@ -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());
qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/UnitTest_FireAutomaton/aes_test_fire_automaton.h
-1
View File
@@ -8,7 +8,6 @@
#pragma once
#include <cstdint>
#include <QtCore>
#include <QMetaType>
#include <AreaEffectSimulation/Utils/fire_automaton.h>