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:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
+3
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
#include <QTimer>
|
||||
#include <QTest>
|
||||
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
|
||||
@@ -25,6 +25,7 @@ AvmFtTests::AvmFtTests(QObject *parent)
|
||||
, m_testId(0)
|
||||
, m_mountingPointId(100)
|
||||
, m_bTestsSuccessful(true)
|
||||
, m_logger(getLogger("FtTest"))
|
||||
{
|
||||
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
|
||||
}
|
||||
|
||||
+3
-2
@@ -26,7 +26,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
@@ -50,7 +50,6 @@ protected Q_SLOTS:
|
||||
void tryModify();
|
||||
void tryDelete();
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onModifyMenuStructReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
void createMenuStructReply(const Core::FunctionReplyObject &replyObject);
|
||||
void modifyMenuStructReply(const Core::FunctionReplyObject &replyObject);
|
||||
@@ -65,6 +64,8 @@ private:
|
||||
int m_testId;
|
||||
int m_mountingPointId;
|
||||
bool m_bTestsSuccessful;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
+6
-7
@@ -21,15 +21,14 @@
|
||||
*/
|
||||
|
||||
#include "avm_vca_tests.h"
|
||||
#include <utility>
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QtTest/QTest>
|
||||
#include <QTest>
|
||||
#include <QtGlobal>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QMap>
|
||||
#include <QStringList>
|
||||
#include <QMap>
|
||||
#include <string>
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
@@ -41,7 +40,7 @@ AvmVcaTests::AvmVcaTests(int domainId, int exerciseId, int operatorId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise))
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_operatorId(operatorId)
|
||||
.getNGLLogger("VcaTest"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("VcaTest"))
|
||||
{
|
||||
Q_ASSERT(exerciseId > 0);
|
||||
Q_ASSERT(operatorId > 0);
|
||||
@@ -194,14 +193,14 @@ void AvmVcaTests::createCnrConfig()
|
||||
|
||||
void AvmVcaTests::removeTvcConfig()
|
||||
{
|
||||
for (auto id: std::as_const(m_tvcConfigIds))
|
||||
for (auto id: qAsConst(m_tvcConfigIds))
|
||||
m_ftc->removeTvcConfigRequest(RemoveTvcConfigRequest{id}, this);
|
||||
QTRY_VERIFY(m_tvcConfigIds.isEmpty());
|
||||
}
|
||||
|
||||
void AvmVcaTests::removeCnrConfig()
|
||||
{
|
||||
for (auto id: std::as_const(m_cnrConfigIds))
|
||||
for (auto id: qAsConst(m_cnrConfigIds))
|
||||
m_ftc->removeCnrConfigRequest(RemoveCnrConfigRequest{id}, this);
|
||||
QTRY_VERIFY(m_cnrConfigIds.isEmpty());
|
||||
}
|
||||
|
||||
+3
-4
@@ -14,8 +14,8 @@
|
||||
#include <AudioVideoManagement/avm_ftc_types.h>
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
@@ -43,8 +43,6 @@ private slots:
|
||||
void test();
|
||||
|
||||
private:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void create();
|
||||
void modify();
|
||||
void remove();
|
||||
@@ -74,6 +72,7 @@ NGL::INGLLogger &m_logger;
|
||||
bool m_removeReplyReceived{false};
|
||||
QVector<int> m_tvcConfigIds;
|
||||
QVector<int> m_cnrConfigIds;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
+3
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
#include <QTimer>
|
||||
#include <QTest>
|
||||
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
|
||||
@@ -27,6 +27,7 @@ MvsTests::MvsTests(QObject *parent)
|
||||
, m_radioStationId(200)
|
||||
, m_exerciseId(0)
|
||||
, m_bTestsSuccessful(true)
|
||||
, m_logger(getLogger("Test"))
|
||||
{
|
||||
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
|
||||
}
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
#include <AudioVideoManagement/logger.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <QtCore/QObject>
|
||||
#include <QObject>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user