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
+1
-2
@@ -21,7 +21,6 @@ MeteoDataView::MeteoDataView(const QString &menuGroup, LtsSession::LtsSession *s
|
||||
, m_ftc(nullptr)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::MeteoDataView)
|
||||
, m_logger(getLogger("MeteoDataManagementDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
@@ -102,7 +101,7 @@ void MeteoDataView::onEditStaticMeteoData()
|
||||
|
||||
MeteoDataManagement::MeteoData meteoData = m_model->getRowData(row);
|
||||
|
||||
DEBUG_LOG(m_logger) << "--- onEditStaticMeteoData() "
|
||||
DEBUG_LOG() << "--- onEditStaticMeteoData() "
|
||||
<< " id: " << meteoData.id()
|
||||
<< " mduId: " << meteoData.weatherStationId()
|
||||
<< " isStaticData: " << meteoData.isStaticMeteoData()
|
||||
|
||||
-3
@@ -43,9 +43,6 @@ private:
|
||||
std::shared_ptr<MeteoDataManagement::Interface::Ftc> m_ftc;
|
||||
LtsSession::LtsSession *m_session;
|
||||
Ui::MeteoDataView *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -20,7 +20,6 @@ MeteoDataModel::MeteoDataModel(QObject *parent)
|
||||
tr("Humidity [%]")},
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("MeteoDataModel"))
|
||||
{}
|
||||
|
||||
|
||||
|
||||
-1
@@ -36,6 +36,5 @@ public:
|
||||
|
||||
private:
|
||||
std::shared_ptr<MeteoDataManagement::Interface::Dtc> m_dtc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -17,7 +17,6 @@ StaticMeteoDataEdit::StaticMeteoDataEdit(QWidget *parent)
|
||||
, m_ftc(nullptr)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::StaticMeteoDataEdit)
|
||||
, m_logger(getLogger("MeteoDataManagementEdit"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_meteoDataId(0)
|
||||
{
|
||||
@@ -43,11 +42,11 @@ bool StaticMeteoDataEdit::init(const std::shared_ptr<MeteoDataManagement::Interf
|
||||
const std::shared_ptr<MeteoDataManagement::Interface::Ftc> &ftc,
|
||||
LtsSession::LtsSession *session)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "StaticMeteoDataEdit::init()";
|
||||
DEBUG_LOG() << "StaticMeteoDataEdit::init()";
|
||||
|
||||
if (!dtc || !ftc || !session)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "StaticMeteoDataEdit::init() Invalid shared_ptr!";
|
||||
ERROR_LOG() << "StaticMeteoDataEdit::init() Invalid shared_ptr!";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -43,7 +43,6 @@ private:
|
||||
std::shared_ptr<MeteoDataManagement::Interface::Ftc> m_ftc;
|
||||
LtsSession::LtsSession *m_session;
|
||||
Ui::StaticMeteoDataEdit *m_ui;
|
||||
NGL::INGLLogger &m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
int m_meteoDataId;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user