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
@@ -38,7 +38,6 @@ ParticipantTemplateChooser::ParticipantTemplateChooser(const QString &menuGroup,
|
||||
, m_session(session)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::ParticipantTemplateChooser)
|
||||
, m_logger(getLogger("ParticipantTemplateChooser"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
|
||||
-2
@@ -63,8 +63,6 @@ private:
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
Ui::ParticipantTemplateChooser *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -16,7 +16,6 @@ ParticipantTemplateChooserFrameless::ParticipantTemplateChooserFrameless(LtsSess
|
||||
, m_dtc(nullptr)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::ParticipantTemplateChooserFrameless)
|
||||
, m_logger(getLogger("ParticipantTemplateChooser"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
|
||||
-2
@@ -38,8 +38,6 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
|
||||
Ui::ParticipantTemplateChooserFrameless *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -22,7 +22,6 @@ ParticipantTemplateChooserModel::ParticipantTemplateChooserModel(bool asSupportS
|
||||
, AdvancedSymbology::TableModelSymbolRenderer<ParticipantTemplateChooserModel>(ColDesignatorIdentifier)
|
||||
, m_asSupportService(asSupportService)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("ParticipantTemplateChooserModel"))
|
||||
{}
|
||||
|
||||
ParticipantTemplateChooserModel::~ParticipantTemplateChooserModel()
|
||||
|
||||
-2
@@ -60,7 +60,5 @@ private:
|
||||
|
||||
bool m_asSupportService;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_dtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -36,7 +36,6 @@ ParticipantTemplateEdit::ParticipantTemplateEdit(LtsSession::LtsSession *session
|
||||
, m_ppmGuiCbxIfc(nullptr)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::ParticipantTemplateEdit)
|
||||
, m_logger(getLogger("ParticipantTemplateEdit"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -403,7 +402,7 @@ void ParticipantTemplateEdit::onDoubleClicked(const QModelIndex &selIndex)
|
||||
void ParticipantTemplateEdit::onSelectionChanged(const QItemSelection & ,
|
||||
const QItemSelection & )
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onSelectionChanged";
|
||||
DEBUG_LOG() << "onSelectionChanged";
|
||||
|
||||
enaDisa();
|
||||
}
|
||||
|
||||
-1
@@ -104,7 +104,6 @@ private:
|
||||
FiringUnitValidator *m_firingUnitValidator { nullptr };
|
||||
|
||||
Ui::ParticipantTemplateEdit *m_ui;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -19,7 +19,6 @@ TemplateUnitNamer::TemplateUnitNamer(bool asSupportService, const std::shared_pt
|
||||
, m_ppmGuiCbxIfc(ppmGuiCbxIfc)
|
||||
, m_ui(new Ui::TemplateUnitNamer)
|
||||
, m_validator(new QRegularExpressionValidator(QRegularExpression(QStringLiteral("[^,;\"'´`]*")), this))
|
||||
, m_logger(getLogger("TemplateTemplateChooser"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
if (!m_ppmGuiCbxIfc || !m_dtc)
|
||||
|
||||
-1
@@ -42,7 +42,6 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> m_ppmGuiCbxIfc;
|
||||
Ui::TemplateUnitNamer *m_ui;
|
||||
QValidator *m_validator;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user