Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
-3
@@ -19,9 +19,6 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION aes_statemachine_test
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES( aes_statemachine_test
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}/..
|
||||
${CMAKE_SOURCE_DIR}/Lts/
|
||||
${CMAKE_SOURCE_DIR}/Lts/Services/
|
||||
${CMAKE_BINARY_DIR}/Lts/
|
||||
)
|
||||
|
||||
|
||||
|
||||
+1
-8
@@ -13,14 +13,7 @@ SET(UnitTestSources
|
||||
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
NGL_ADD_EXECUTABLE(SV aesUnitTestBasics ${LinkedSources} ${UnitTestSources} )
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestBasics
|
||||
PUBLIC
|
||||
${CMAKE_SOURCE_DIR}/Lts/
|
||||
${CMAKE_SOURCE_DIR}/Lts/Services/
|
||||
${CMAKE_BINARY_DIR}/Lts/
|
||||
)
|
||||
ADD_EXECUTABLE(aesUnitTestBasics ${LinkedSources} ${UnitTestSources} )
|
||||
|
||||
TARGET_LINK_LIBRARIES(aesUnitTestBasics
|
||||
NGLLogger
|
||||
|
||||
+4
-5
@@ -7,13 +7,12 @@
|
||||
*/
|
||||
|
||||
#include "basics_unit_test.h"
|
||||
#include <utility>
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <AreaEffectSimulation/aes.hpp>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include <QtTest/QSignalSpy>
|
||||
|
||||
#include <iostream>
|
||||
@@ -247,7 +246,7 @@ void UnitTestBasics::test_fireTimer10()
|
||||
QStringList logSl1 = ft.getLogHistorie();
|
||||
QVERIFY2(logSl1.size() == 1, "getCommandHistorie failed");
|
||||
|
||||
for (const auto &log : std::as_const(logSl1))
|
||||
for (const auto &log : qAsConst(logSl1))
|
||||
NOTICE_LOG(m_logger) << "log ='" << log << "'";
|
||||
}
|
||||
|
||||
@@ -320,7 +319,7 @@ void UnitTestBasics::test_fireTimer20()
|
||||
|
||||
// QList<QVariant> arguments = spyStateChanged.takeFirst(); // take the first signal
|
||||
// NOTICE_LOG(m_logger) << " spyStateChanged.count() " << spyStateChanged.count();
|
||||
// for (const QList<QVariant> &argument : std::as_const(spyStateChanged))
|
||||
// for (const QList<QVariant> &argument : qAsConst(spyStateChanged))
|
||||
// NOTICE_LOG(m_logger) << " spyStateChanged . argument " << argument.first().toInt();
|
||||
|
||||
// check order of signal paramter:
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <../../logger.h>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
#include <AreaEffectSimulation/Utils/firing_timer.h>
|
||||
|
||||
|
||||
+1
-8
@@ -13,14 +13,7 @@ SET(UnitTestSources
|
||||
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
NGL_ADD_EXECUTABLE(SV aesUnitTestPolygons ${LinkedSources} ${UnitTestSources} )
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestPolygons
|
||||
PUBLIC
|
||||
${CMAKE_SOURCE_DIR}/Lts/
|
||||
${CMAKE_SOURCE_DIR}/Lts/Services/
|
||||
${CMAKE_BINARY_DIR}/Lts/
|
||||
)
|
||||
ADD_EXECUTABLE(aesUnitTestPolygons ${LinkedSources} ${UnitTestSources} )
|
||||
|
||||
TARGET_LINK_LIBRARIES(aesUnitTestPolygons
|
||||
NGLLogger
|
||||
|
||||
+5
-6
@@ -7,15 +7,14 @@
|
||||
*/
|
||||
|
||||
#include "polygons_unit_test.h"
|
||||
#include <utility>
|
||||
#include <Services/AreaEffectSimulation/Utils/polygons.h>
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QTransform>
|
||||
#include <QtCore/QTextStream> //
|
||||
#include <QTextStream> //
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
#include <iostream>
|
||||
@@ -211,7 +210,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp()
|
||||
qCritical() << "rotation_deg = " << rotation_deg
|
||||
<< ", mtpRotationNorthDegree = " << mtpRotationNorthDegree
|
||||
<< ", explosionClusterDb = " << singleExplosions;
|
||||
for (const auto &singleExplosion : std::as_const(singleExplosions))
|
||||
for (const auto &singleExplosion : qAsConst(singleExplosions))
|
||||
qDebug() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs();
|
||||
|
||||
size_t i = 0;
|
||||
@@ -243,7 +242,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp()
|
||||
qCritical() << "rotation_deg = " << rotation_deg
|
||||
<< ", mtpRotationNorthDegree = " << mtpRotationNorthDegree
|
||||
<< " explosionClusterDb = " << singleExplosions;
|
||||
for (const auto &singleExplosion : std::as_const(singleExplosions))
|
||||
for (const auto &singleExplosion : qAsConst(singleExplosions))
|
||||
qCritical() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs();
|
||||
|
||||
size_t i = 0;
|
||||
@@ -280,7 +279,7 @@ void UnitTestPolygons::test_explosionClusterSingleExplosionsGAUSS_Mtp()
|
||||
<< ", zog = " << zog
|
||||
<< ", mtpRotationNorthDegree = " << mtpRotationNorthDegree
|
||||
<< " explosionClusterDb = " << singleExplosions;
|
||||
for (const auto &singleExplosion : std::as_const(singleExplosions))
|
||||
for (const auto &singleExplosion : qAsConst(singleExplosions))
|
||||
qCritical() << "singleExUtm: " << LtsCoordTrans::UtmCoordinate::fromGeographic(singleExplosion).mgrs();
|
||||
|
||||
size_t i = 0;
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
|
||||
|
||||
+1
-8
@@ -13,14 +13,7 @@ SET(UnitTestSources
|
||||
SOURCE_GROUP( UnitTestSources FILES ${UnitTestSources} )
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
NGL_ADD_EXECUTABLE(SV aesUnitTestTneAlgorithmen ${UnitTestSources} )
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(aesUnitTestTneAlgorithmen
|
||||
PUBLIC
|
||||
${CMAKE_SOURCE_DIR}/Lts/
|
||||
${CMAKE_SOURCE_DIR}/Lts/Services/
|
||||
${CMAKE_BINARY_DIR}/Lts/
|
||||
)
|
||||
ADD_EXECUTABLE(aesUnitTestTneAlgorithmen ${LinkedSources} ${UnitTestSources} )
|
||||
|
||||
TARGET_LINK_LIBRARIES(aesUnitTestTneAlgorithmen
|
||||
NGLLogger
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QDir>
|
||||
#include <QFile>
|
||||
#include <QDir>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QCoreApplication>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
*/
|
||||
|
||||
#include "aes_statemachine_test.h"
|
||||
#include <QtCore/QDebug>
|
||||
#include <QDebug>
|
||||
#include <QSignalSpy>
|
||||
#include <QtTest/QTest>
|
||||
#include <QTest>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
|
||||
using namespace AreaEffectSimulation;
|
||||
|
||||
Reference in new issue
Block a user