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
+7
-8
@@ -53,7 +53,6 @@ DetailData::DetailData(LtsSession::LtsSession *session, QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_session(session)
|
||||
, __already_populated__(false)
|
||||
, m_logger(getLogger("DetailData"))
|
||||
{
|
||||
populate();
|
||||
}
|
||||
@@ -397,7 +396,7 @@ DetailData::GetDetailDataResultList DetailData::getDetailData(const LtsTimelineC
|
||||
const QJsonObject &root = event->detailData();
|
||||
for (auto i = root.constBegin(); i != root.constEnd(); ++i)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Adding Detail Data for: " << i.key();
|
||||
DEBUG_LOG() << "Adding Detail Data for: " << i.key();
|
||||
result.append(getDetailDataForAttribute(i.key(), *i));
|
||||
}
|
||||
|
||||
@@ -417,7 +416,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
|
||||
|
||||
if (attribute.isNull() || attribute.isUndefined())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "DetailData::getDetailDataForAttribute: no attribute type " << attributeType
|
||||
WARNING_LOG() << "DetailData::getDetailDataForAttribute: no attribute type " << attributeType
|
||||
<< " in " << QJsonDocument(root).toJson();
|
||||
|
||||
result.requestResult = DetailData::RequestResult::InvalidAttributeType;
|
||||
@@ -462,7 +461,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
|
||||
case QJsonValue::Null:
|
||||
case QJsonValue::Undefined:
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Timeline: DetailData::getDetailDataForAttribute: attribute value is null or undefined! " << attributeValueJson.toString();
|
||||
WARNING_LOG() << "Timeline: DetailData::getDetailDataForAttribute: attribute value is null or undefined! " << attributeValueJson.toString();
|
||||
result.requestResult = DetailData::RequestResult::InvalidAttributeTypeJson;
|
||||
return result;
|
||||
}
|
||||
@@ -498,7 +497,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
|
||||
|
||||
default:
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Timeline: DetailData::getDetailDataForAttribute: attribute value cannot be handled. Type " << attributeValueJson.type() << attributeValueJson.toString();
|
||||
WARNING_LOG() << "Timeline: DetailData::getDetailDataForAttribute: attribute value cannot be handled. Type " << attributeValueJson.type() << attributeValueJson.toString();
|
||||
result.requestResult = DetailData::RequestResult::InvalidAttributeType;
|
||||
return result;
|
||||
}
|
||||
@@ -548,7 +547,7 @@ DetailData::GetDetailDataForAttributeResult DetailData::getDetailDataForAttribut
|
||||
|
||||
if (concreteAttributeType == attributeType)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "getDetailDataForAttribute: attribute type " << attributeType << " does not have an UiType !!!";
|
||||
ERROR_LOG() << "getDetailDataForAttribute: attribute type " << attributeType << " does not have an UiType !!!";
|
||||
result.requestResult = DetailData::RequestResult::NoUiTypeForAttribute;
|
||||
}
|
||||
else
|
||||
@@ -692,7 +691,7 @@ QString DetailData::AttributeTypeLookup::getAttributeType(const QString &attribu
|
||||
return i.key();
|
||||
}
|
||||
|
||||
WARNING_LOG(m_logger) << "getAttributeType: attribute type not found by text '" << attributeText << "'";
|
||||
WARNING_LOG() << "getAttributeType: attribute type not found by text '" << attributeText << "'";
|
||||
return QString();
|
||||
}
|
||||
|
||||
@@ -722,7 +721,7 @@ void DetailData::AttributeParameterLookup::addParameter(const QString &attribute
|
||||
{
|
||||
if (!parameterMap.count())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "addParameter: parameter map is empty!";
|
||||
WARNING_LOG() << "addParameter: parameter map is empty!";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user