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
+5
-6
@@ -33,9 +33,8 @@ TcpWeatherStation::TcpWeatherStation(int id,
|
||||
, m_speed(0.0)
|
||||
, m_climateOk(false)
|
||||
, m_windOk(false)
|
||||
, m_logger(getLogger("TcpWeatherStation"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start TcpWeatherStation ip/(hostname): " << m_converterIp
|
||||
INFO_LOG() << "Start TcpWeatherStation ip/(hostname): " << m_converterIp
|
||||
<< " climatePort: " << m_climatePort
|
||||
<< " windPort: " << m_windPort;
|
||||
|
||||
@@ -43,7 +42,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
|
||||
{
|
||||
m_tcpClimate = new TcpClimate(this);
|
||||
|
||||
INFO_LOG(m_logger) << "m_tcpClimate->start(" << m_converterIp << ", "
|
||||
INFO_LOG() << "m_tcpClimate->start(" << m_converterIp << ", "
|
||||
<< QString::number(m_climatePort) << ")";
|
||||
m_tcpClimate->start(m_converterIp, m_climatePort);
|
||||
|
||||
@@ -55,7 +54,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
|
||||
{
|
||||
m_tcpWind = new TcpWind(this);
|
||||
|
||||
INFO_LOG(m_logger) << "m_tcpWind->start(" << m_converterIp << ", "
|
||||
INFO_LOG() << "m_tcpWind->start(" << m_converterIp << ", "
|
||||
<< QString::number(m_windPort) << ")";
|
||||
|
||||
m_tcpWind->start(m_converterIp, m_windPort);
|
||||
@@ -69,7 +68,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
|
||||
|
||||
void TcpWeatherStation::onClimateDataChanged(float pressure, float temperature, float humidity, bool climateOk)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onClimateDataChanged()"
|
||||
INFO_LOG() << "onClimateDataChanged()"
|
||||
<< " MDU AssetId: " << m_id
|
||||
<< " pressure: " << pressure
|
||||
<< " temperature: " << temperature
|
||||
@@ -88,7 +87,7 @@ void TcpWeatherStation::onClimateDataChanged(float pressure, float temperature,
|
||||
|
||||
void TcpWeatherStation::onWindDataChanged(float direction, float speed, bool windOk)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onWindDataChanged()"
|
||||
INFO_LOG() << "onWindDataChanged()"
|
||||
<< " MDU AssetId: " << m_id
|
||||
<< " direction: " << direction
|
||||
<< " speed: " << speed
|
||||
|
||||
Reference in new issue
Block a user