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
@@ -73,7 +73,6 @@ LogViewTelegram::LogViewTelegram(const LogViewTelegram &o)
|
||||
, m_data(o.m_data)
|
||||
, m_json(o.m_json)
|
||||
, m_TetraTelegram(nullptr)
|
||||
, m_logger(getLogger("LogViewTelegram"))
|
||||
{
|
||||
if (!m_data.isEmpty())
|
||||
m_TetraTelegram = new N_CoPrtCnv::CoPrtCnvRadioTelegram(m_data);
|
||||
@@ -101,7 +100,6 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
|
||||
, m_LogTime(0)
|
||||
, m_GpsTime(0)
|
||||
, m_TetraTelegram(nullptr)
|
||||
, m_logger(getLogger("LogViewTelegram"))
|
||||
{
|
||||
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
|
||||
if (waitTime > 0)
|
||||
@@ -145,7 +143,6 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv
|
||||
, m_GpsTime(0)
|
||||
, m_data(a_telegramData)
|
||||
, m_TetraTelegram(nullptr)
|
||||
, m_logger(getLogger("LogViewTelegram"))
|
||||
{
|
||||
const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt();
|
||||
if (waitTime > 0)
|
||||
@@ -620,7 +617,7 @@ void LogViewTelegram::resetOffset()
|
||||
m_ActOffset = START_OFFSET_CENTRAL;
|
||||
break;
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "resetOffset is only for Central-Protocol implemented";
|
||||
ERROR_LOG() << "resetOffset is only for Central-Protocol implemented";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1003,7 +1000,7 @@ MemberInformation LogViewTelegram::memberFromStructInformation(const StructInfor
|
||||
|
||||
LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString& a_name, uint16_t a_arraySize, const LogViewXdrType* a_parentElement, const bool a_hasContent)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "a_type=" << a_type << " a_name=" << a_name << " a_arraySize=" << a_arraySize;
|
||||
DEBUG_LOG() << "a_type=" << a_type << " a_name=" << a_name << " a_arraySize=" << a_arraySize;
|
||||
const LogViewXdrElement* xdrElement = tetraParser()->getElement(a_type);
|
||||
if (!xdrElement)
|
||||
return nullptr;
|
||||
@@ -1041,7 +1038,7 @@ LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString
|
||||
int arraySize = child->getArraySize();
|
||||
if (0 == arraySize && !isScalar(child))
|
||||
{
|
||||
INFO_LOG(m_logger) << "dyn. array of struc";
|
||||
INFO_LOG() << "dyn. array of struc";
|
||||
arraySize = getDynArraySize(m_ActOffset);
|
||||
isDynArray = true;
|
||||
}
|
||||
@@ -1085,7 +1082,7 @@ LogViewField* LogViewTelegram::getFieldTree(const QString& a_type, const QString
|
||||
else
|
||||
{
|
||||
|
||||
INFO_LOG(m_logger) << "typedef dynamisch";
|
||||
INFO_LOG() << "typedef dynamisch";
|
||||
}
|
||||
maxArraySize = static_cast<const LogViewXdrType*>(xdrElement)->getMaxArraySize();
|
||||
while (xdrElement->getKind() != LogViewXdrElement::e_KindStandardType)
|
||||
@@ -1411,10 +1408,10 @@ LogViewField* LogViewTelegram::getContent(const LogViewXdrStandardType* a_standa
|
||||
const quint64 value = getUIntX(i*size+a_offset, size, byteOrder);
|
||||
if (8 == size) {
|
||||
field->addValue(QString::number(xdrToDouble(value)));
|
||||
INFO_LOG(m_logger) << "value=" << xdrToDouble(value);
|
||||
INFO_LOG() << "value=" << xdrToDouble(value);
|
||||
} else {
|
||||
field->addValue(QString::number(xdrToFloat(value)));
|
||||
INFO_LOG(m_logger) << "value=" << xdrToFloat(value);
|
||||
INFO_LOG() << "value=" << xdrToFloat(value);
|
||||
}
|
||||
}
|
||||
field->setIsRightAligned(true);
|
||||
@@ -1443,7 +1440,7 @@ LogViewField* LogViewTelegram::getContent(const LogViewXdrStandardType* a_standa
|
||||
break;
|
||||
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "ValueKind " << a_standardType->getValueKind() << " not implemented!";
|
||||
ERROR_LOG() << "ValueKind " << a_standardType->getValueKind() << " not implemented!";
|
||||
break;
|
||||
}
|
||||
uint16_t sizeOfContent = arraySize * size;
|
||||
@@ -1615,7 +1612,7 @@ bool LogViewTelegram::isScalar(const LogViewXdrType* a_xdrType) const
|
||||
|
||||
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "name=" << xdrElement->getName().toStdString() << " kind=" << xdrElement->getKind() << " case not implemented!";
|
||||
ERROR_LOG() << "name=" << xdrElement->getName().toStdString() << " kind=" << xdrElement->getKind() << " case not implemented!";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user