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
+18
-19
@@ -22,7 +22,6 @@ PdmTests::PdmTests(QObject *parent)
|
||||
, m_id(0)
|
||||
, m_testId(0)
|
||||
, m_bTestsSuccessful(true)
|
||||
, m_logger(getLogger("Test"))
|
||||
{
|
||||
qRegisterMetaType<Core::FunctionReply>("Core::FunctionReply");
|
||||
}
|
||||
@@ -34,22 +33,22 @@ PdmTests::~PdmTests()
|
||||
//---------------------------------------------------------------------------------
|
||||
bool PdmTests::init(int domainId, int testId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init begin";
|
||||
DEBUG_LOG() << "init begin";
|
||||
m_testId = testId;
|
||||
|
||||
// initialize DDS
|
||||
m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0));
|
||||
if (!m_ddsConnector->init())
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
|
||||
DEBUG_LOG(m_logger) << "create dtc";
|
||||
DEBUG_LOG() << "create dtc";
|
||||
m_dtc = ProjectDataManagement::Interface::Dtc::create(m_ddsConnector);
|
||||
DEBUG_LOG(m_logger) << "create ftc";
|
||||
DEBUG_LOG() << "create ftc";
|
||||
m_ftc = ProjectDataManagement::Interface::Ftc::create(m_ddsConnector);
|
||||
bool bRet = m_dtc->enableAll() && m_ftc->enableAll();
|
||||
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
|
||||
DEBUG_LOG() << "init end - bRet = " << bRet;
|
||||
|
||||
return bRet;
|
||||
}
|
||||
@@ -57,7 +56,7 @@ bool PdmTests::init(int domainId, int testId)
|
||||
//---------------------------------------------------------------------------------
|
||||
void PdmTests::startTest()
|
||||
{
|
||||
INFO_LOG(m_logger) << "startTest";
|
||||
INFO_LOG() << "startTest";
|
||||
if (m_testId == 0)
|
||||
{
|
||||
QTimer::singleShot(1000, this, &PdmTests::tryGetAllVulnerabilityKinds);
|
||||
@@ -73,7 +72,7 @@ void PdmTests::startTest()
|
||||
}
|
||||
else
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Unknown test case!";
|
||||
ERROR_LOG() << "Unknown test case!";
|
||||
failExit();
|
||||
}
|
||||
QTimer::singleShot(5000, qApp, &QCoreApplication::quit);
|
||||
@@ -83,21 +82,21 @@ void PdmTests::startTest()
|
||||
//---------------------------------------------------------------------------------
|
||||
void PdmTests::tryGetAllVulnerabilityKinds()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to get all ProjectDataManagements";
|
||||
INFO_LOG() << "trying to get all ProjectDataManagements";
|
||||
const QMap<qint32, ProjectDataManagement::VulnerabilityKind> map = m_dtc->vulnerabilityKinds();
|
||||
if (map.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting vulnerability kinds data";
|
||||
ERROR_LOG() << "Error requesting vulnerability kinds data";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "Amount of vulnerability kinds = " << map.size();
|
||||
INFO_LOG() << "Amount of vulnerability kinds = " << map.size();
|
||||
m_id = map.firstKey();
|
||||
for(auto it = map.begin(); it != map.end(); ++it)
|
||||
{
|
||||
const ProjectDataManagement::VulnerabilityClass &vc = it.value().vulnerabilityClassId();
|
||||
INFO_LOG(m_logger) << "VulnerabilityKind(" << it.key() << ") : " << it.value().name()
|
||||
INFO_LOG() << "VulnerabilityKind(" << it.key() << ") : " << it.value().name()
|
||||
<< ", translation " << m_dtc->trVulnerabilityKindName(it.key(), vc);
|
||||
}
|
||||
}
|
||||
@@ -108,18 +107,18 @@ void PdmTests::tryGetAllVulnerabilityKinds()
|
||||
//---------------------------------------------------------------------------------
|
||||
void PdmTests::tryGetVulnerabilityKind()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying get itemData for Vulnerability kind " << m_id;
|
||||
INFO_LOG() << "trying get itemData for Vulnerability kind " << m_id;
|
||||
ProjectDataManagement::VulnerabilityKind data = m_dtc->vulnerabilityKind(m_id);
|
||||
|
||||
if (data.taVulnerabilityKind() <= 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error receiving data for id " << m_id;
|
||||
ERROR_LOG() << "Error receiving data for id " << m_id;
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
const ProjectDataManagement::VulnerabilityClass &vc = data.vulnerabilityClassId();
|
||||
INFO_LOG(m_logger) << "## VulnerabilityKind: (" << data.taVulnerabilityKind() << "), name: " << data.name()
|
||||
INFO_LOG() << "## VulnerabilityKind: (" << data.taVulnerabilityKind() << "), name: " << data.name()
|
||||
<< ", translation " << m_dtc->trVulnerabilityKindName(m_id, vc);
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
}
|
||||
@@ -129,19 +128,19 @@ void PdmTests::tryGetVulnerabilityKind()
|
||||
//---------------------------------------------------------------------------------
|
||||
void PdmTests::tryGetAllBiteComponentTexts()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to get all Bite Component Texts";
|
||||
INFO_LOG() << "trying to get all Bite Component Texts";
|
||||
const QMap<qint32, ProjectDataManagement::BiteComponentText> map = m_dtc->biteComponentTexts();
|
||||
if (map.isEmpty())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting bite components text data";
|
||||
ERROR_LOG() << "Error requesting bite components text data";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "Amount of bite component texts = " << map.size();
|
||||
INFO_LOG() << "Amount of bite component texts = " << map.size();
|
||||
m_id = map.firstKey();
|
||||
for(auto it = map.begin(); it != map.end(); ++it)
|
||||
INFO_LOG(m_logger) << "BiteComponent(" << it.key() << ") : " << it.value().name()
|
||||
INFO_LOG() << "BiteComponent(" << it.key() << ") : " << it.value().name()
|
||||
<< ", translation " << m_dtc->trBiteComponentTextName(it.key());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user