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
+3
-4
@@ -20,9 +20,8 @@ PresentationEditDialog::PresentationEditDialog(QWidget *parent)
|
||||
, m_opmDtc(nullptr)
|
||||
, m_presentationId(-1)
|
||||
, m_ui(new Ui::PresentationEditDialog)
|
||||
, m_logger(getLogger("PresentationEditDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationEditDialog ctor";
|
||||
DEBUG_LOG() << "PresentationEditDialog ctor";
|
||||
|
||||
|
||||
m_ui->setupUi(this);
|
||||
@@ -52,7 +51,7 @@ bool PresentationEditDialog::init(int presentationId,
|
||||
const std::shared_ptr<Interface::Ftc> &ftc,
|
||||
const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationEditDialog::init";
|
||||
DEBUG_LOG() << "PresentationEditDialog::init";
|
||||
m_presentationId = presentationId;
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
@@ -141,7 +140,7 @@ bool PresentationEditDialog::apply()
|
||||
}
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Content size = " << m_content.size() << " for presentationId: " << m_presentationId;
|
||||
DEBUG_LOG() << "Content size = " << m_content.size() << " for presentationId: " << m_presentationId;
|
||||
req.content(m_content);
|
||||
|
||||
m_presentationId = m_ftc->presentationModifyRequest(req);
|
||||
|
||||
+1
-3
@@ -9,7 +9,7 @@
|
||||
#include <Services/PresentationManagement/pre_dtc.h>
|
||||
#include <Services/PresentationManagement/pre_ftc.h>
|
||||
#include <Services/OperatorManagement/opm_dtc.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
#include <Lts/Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
@@ -54,7 +54,5 @@ private:
|
||||
int m_presentationId;
|
||||
std::vector<PresentationManagement::PresentationContent> m_content;
|
||||
Ui::PresentationEditDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
-1
@@ -7,7 +7,6 @@ namespace PresentationManagement
|
||||
{
|
||||
PreMobileDialogModel::PreMobileDialogModel(QObject *parent)
|
||||
: PresentationManagementDialogModel(parent)
|
||||
, m_logger(getLogger("PreMobileDialogModel"))
|
||||
{
|
||||
|
||||
m_checkboxColumn = 1;
|
||||
|
||||
+1
-2
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <Services/PresentationManagement/logger.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
#include <Lts/Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
|
||||
#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
|
||||
|
||||
@@ -35,6 +35,5 @@ private:
|
||||
QVector<bool> m_vecDownload;
|
||||
|
||||
int m_checkboxColumn;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -19,7 +19,6 @@ PresentationManagementDialogModel::PresentationManagementDialogModel(QObject *pa
|
||||
tr("LastModified"),
|
||||
tr("Status")},
|
||||
parent)
|
||||
, m_logger(getLogger("PresentationManagementDialogModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -47,7 +46,7 @@ bool PresentationManagementDialogModel::initModel(const std::shared_ptr<Interfac
|
||||
m_users.insert(static_cast<int>(it.value().id()), QString::fromStdString(it.value().name()));
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #presentations: " << m_vecData.size();
|
||||
INFO_LOG() << "initModel - #presentations: " << m_vecData.size();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-3
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <Services/PresentationManagement/pre_dtc.h>
|
||||
#include <Services/PresentationManagement/logger.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
#include <Lts/Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
#include <Services/OperatorManagement/opm_dtc.h>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
@@ -54,8 +54,6 @@ private:
|
||||
|
||||
QMap<int, QString> m_users;
|
||||
QVector <int> m_scriptUsers;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
#include <Lts/Plugins/PresentationManagement/Gui/Common/preguicommon_export.h>
|
||||
#include <QString>
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user