Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+33
-34
@@ -27,7 +27,6 @@ MvsTests::MvsTests(QObject *parent)
|
||||
, m_radioStationId(200)
|
||||
, m_exerciseId(0)
|
||||
, m_bTestsSuccessful(true)
|
||||
, m_logger(getLogger("Test"))
|
||||
{
|
||||
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
|
||||
}
|
||||
@@ -39,7 +38,7 @@ MvsTests::~MvsTests()
|
||||
//----------------------------------------------------------------------------------
|
||||
bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int stationId, int exerciseId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "init begin";
|
||||
INFO_LOG() << "init begin";
|
||||
|
||||
m_testId = testId;
|
||||
m_teamId = teamId;
|
||||
@@ -53,18 +52,18 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
|
||||
return false;
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
|
||||
DEBUG_LOG(m_logger) << "create ftc MVS";
|
||||
DEBUG_LOG() << "create ftc MVS";
|
||||
m_ftc = AudioVideoManagement::Interface::Ftc::create(m_ddsConnector);
|
||||
DEBUG_LOG(m_logger) << "init ftc MVS";
|
||||
DEBUG_LOG() << "init ftc MVS";
|
||||
bool bRet = m_ftc->enableAll();
|
||||
DEBUG_LOG(m_logger) << "init end MVS - bRet = " << bRet;
|
||||
DEBUG_LOG() << "init end MVS - bRet = " << bRet;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Domain Id = " << domainId;
|
||||
DEBUG_LOG(m_logger) << "Team Id = " << teamId;
|
||||
DEBUG_LOG(m_logger) << "Test Id = " << testId;
|
||||
DEBUG_LOG(m_logger) << "Receiver Id = " << receiverId;
|
||||
DEBUG_LOG(m_logger) << "Radio Station Id = " << stationId;
|
||||
DEBUG_LOG(m_logger) << "Exercise Id = " << exerciseId;
|
||||
DEBUG_LOG() << "Domain Id = " << domainId;
|
||||
DEBUG_LOG() << "Team Id = " << teamId;
|
||||
DEBUG_LOG() << "Test Id = " << testId;
|
||||
DEBUG_LOG() << "Receiver Id = " << receiverId;
|
||||
DEBUG_LOG() << "Radio Station Id = " << stationId;
|
||||
DEBUG_LOG() << "Exercise Id = " << exerciseId;
|
||||
|
||||
return bRet;
|
||||
}
|
||||
@@ -72,7 +71,7 @@ bool MvsTests::init(int domainId, int testId, int teamId, int receiverId, int st
|
||||
//----------------------------------------------------------------------------------
|
||||
void MvsTests::startTest()
|
||||
{
|
||||
INFO_LOG(m_logger) << "startTest";
|
||||
INFO_LOG() << "startTest";
|
||||
switch (m_testId)
|
||||
{
|
||||
// case 1:
|
||||
@@ -100,18 +99,18 @@ void MvsTests::startTest()
|
||||
tryModifyAvsVideoReceiver();
|
||||
break;
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "Unknown test case !";
|
||||
ERROR_LOG() << "Unknown test case !";
|
||||
failExit();
|
||||
break;
|
||||
}
|
||||
INFO_LOG(m_logger) << "********* endTest **************";
|
||||
INFO_LOG() << "********* endTest **************";
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------
|
||||
//void MvsTests::tryCreateVideoTeam()
|
||||
//{
|
||||
// INFO_LOG(m_logger) << "trying to send createRequest VideoTeam";
|
||||
// INFO_LOG() << "trying to send createRequest VideoTeam";
|
||||
// VideoTeamModifyRequest request;
|
||||
|
||||
// request.id(0);
|
||||
@@ -126,7 +125,7 @@ void MvsTests::startTest()
|
||||
|
||||
// if (!m_ftc->videoTeamModifyRequest(request, this))
|
||||
// {
|
||||
// INFO_LOG(m_logger) << "Error requesting create data, as expected";
|
||||
// INFO_LOG() << "Error requesting create data, as expected";
|
||||
// successExit();
|
||||
// }
|
||||
|
||||
@@ -151,7 +150,7 @@ void MvsTests::tryModifyVideoTeam()
|
||||
|
||||
if (!m_ftc->videoTeamModifyRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data";
|
||||
ERROR_LOG() << "Error requesting modify data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -167,7 +166,7 @@ void MvsTests::tryModifyVideoTeam()
|
||||
|
||||
// if (!m_ftc->videoTeamRemoveRequest(request, this))
|
||||
// {
|
||||
// ERROR_LOG(m_logger) << "Error requesting remove data";
|
||||
// ERROR_LOG() << "Error requesting remove data";
|
||||
// failExit();
|
||||
// }
|
||||
|
||||
@@ -177,7 +176,7 @@ void MvsTests::tryModifyVideoTeam()
|
||||
//----------------------------------------------------------------------------------
|
||||
void MvsTests::tryCreateVideoReceiver()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to send createRequest VideoReceiver";
|
||||
INFO_LOG() << "trying to send createRequest VideoReceiver";
|
||||
VideoReceiverModifyRequest request;
|
||||
|
||||
request.id(0);
|
||||
@@ -190,7 +189,7 @@ void MvsTests::tryCreateVideoReceiver()
|
||||
|
||||
if (!m_ftc->videoReceiverModifyRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -212,7 +211,7 @@ void MvsTests::tryModifyVideoReceiver()
|
||||
|
||||
if (!m_ftc->videoReceiverModifyRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data";
|
||||
ERROR_LOG() << "Error requesting modify data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -230,7 +229,7 @@ void MvsTests::tryModifyAvsVideoReceiver()
|
||||
|
||||
if (!m_ftc->videoReceiverModifyAvsRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify AVS data";
|
||||
ERROR_LOG() << "Error requesting modify AVS data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -247,7 +246,7 @@ void MvsTests::tryModifyActiveVideoReceiver()
|
||||
|
||||
if (!m_ftc->videoReceiverModifyActiveRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify active data";
|
||||
ERROR_LOG() << "Error requesting modify active data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -264,7 +263,7 @@ void MvsTests::tryDeleteVideoReceiver()
|
||||
|
||||
if (!m_ftc->videoReceiverRemoveRequest(request, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data";
|
||||
ERROR_LOG() << "Error requesting remove data";
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -275,7 +274,7 @@ void MvsTests::tryDeleteVideoReceiver()
|
||||
//----------------------------------------------------------------------------------
|
||||
void MvsTests::failExit()
|
||||
{
|
||||
ERROR_LOG(m_logger) << "FAIL EXIT !";
|
||||
ERROR_LOG() << "FAIL EXIT !";
|
||||
m_bTestsSuccessful = false;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
}
|
||||
@@ -283,7 +282,7 @@ void MvsTests::failExit()
|
||||
//----------------------------------------------------------------------------------
|
||||
void MvsTests::successExit()
|
||||
{
|
||||
INFO_LOG(m_logger) << "SUCCES EXIT !";
|
||||
INFO_LOG() << "SUCCES EXIT !";
|
||||
m_bTestsSuccessful = true;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
}
|
||||
@@ -292,14 +291,14 @@ void MvsTests::successExit()
|
||||
//----------------------------------------------------------------------------------
|
||||
void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "END (onVideoTeamModifyReply)";
|
||||
DEBUG_LOG() << "END (onVideoTeamModifyReply)";
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got onVideoTeamModifyReply error: " << replyObject();
|
||||
ERROR_LOG() << "Got onVideoTeamModifyReply error: " << replyObject();
|
||||
QTimer::singleShot(0, qApp, SLOT(quit()));
|
||||
return;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got Reply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
m_teamId = replyObject.id();
|
||||
@@ -310,14 +309,14 @@ void MvsTests::onVideoTeamModifyReply(const Core::FunctionReplyObject &replyObje
|
||||
//----------------------------------------------------------------------------------
|
||||
void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "END (onVideoReceiverModifyReply)";
|
||||
DEBUG_LOG() << "END (onVideoReceiverModifyReply)";
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got onVideoReceiverModifyReply error: " << replyObject();
|
||||
ERROR_LOG() << "Got onVideoReceiverModifyReply error: " << replyObject();
|
||||
QTimer::singleShot(0, qApp, SLOT(quit()));
|
||||
return;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got Reply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
|
||||
m_receiverId = replyObject.id();
|
||||
@@ -328,7 +327,7 @@ void MvsTests::onVideoReceiverModifyReply(const Core::FunctionReplyObject &reply
|
||||
// ------------------------------------------------------------------------------
|
||||
void MvsTests::onError(const QString &reason)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got Reply error: " << reason;
|
||||
ERROR_LOG() << "Got Reply error: " << reason;
|
||||
failExit();
|
||||
}
|
||||
|
||||
@@ -340,7 +339,7 @@ void MvsTests::onReply(const Core::FunctionReplyObject &replyObject)
|
||||
onError(replyObject.translated());
|
||||
return;
|
||||
}
|
||||
INFO_LOG(m_logger) << "Got Reply with id " << replyObject.id()
|
||||
INFO_LOG() << "Got Reply with id " << replyObject.id()
|
||||
<< " and errorString " << replyObject.translated();
|
||||
// QTimer::singleShot(0, qApp, SLOT(quit()));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user