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
-1
@@ -270,7 +270,7 @@ QVariant NumeralCodeModel::data(const QModelIndex &index, int role) const
|
||||
|
||||
bool NumeralCodeModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "setData() row/col: " << index.row() << "/" << index.column()
|
||||
DEBUG_LOG() << "setData() row/col: " << index.row() << "/" << index.column()
|
||||
<< " char:" << value.toString();
|
||||
|
||||
QString tmp = value.toString();
|
||||
|
||||
+1
-2
@@ -85,6 +85,5 @@ private:
|
||||
QVector <char> m_RowSelectionValues;
|
||||
QVector <char> m_ColumnSelectionValues;
|
||||
|
||||
bool m_isEditMode;
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool m_isEditMode;
|
||||
};
|
||||
+3
-3
@@ -139,7 +139,7 @@ void MainDialog::onPbSetHorizontalHeaderCSV()
|
||||
|
||||
csvVec.remove(columnSelectionValues.size() * 2 - 1);
|
||||
|
||||
DEBUG_LOG(m_logger) << "onPbSetHorizontalHeaderCSV() "
|
||||
DEBUG_LOG() << "onPbSetHorizontalHeaderCSV() "
|
||||
<< " csvVec.size(): " << csvVec.size();
|
||||
|
||||
m_numCodeModel->setColumnSelectionValuesCSV(csvVec);
|
||||
@@ -178,7 +178,7 @@ void MainDialog::onPbSetVerticalHeaderCSV()
|
||||
|
||||
csvVec.remove(rowSelectionValues.size() * 2 - 1);
|
||||
|
||||
DEBUG_LOG(m_logger) << "onPbSetVerticalHeaderCSV() "
|
||||
DEBUG_LOG() << "onPbSetVerticalHeaderCSV() "
|
||||
<< " csvVec.size(): " << csvVec.size();
|
||||
|
||||
m_numCodeModel->setRowSelectionValuesCSV(csvVec);
|
||||
@@ -199,7 +199,7 @@ void MainDialog::getNumeralCodeHeader()
|
||||
for (int i = 0; i < qVecVH.size(); ++i)
|
||||
qbaVH.append(qVecVH.at(i));
|
||||
|
||||
DEBUG_LOG(m_logger) << "getNumeralCodeHeader()"
|
||||
DEBUG_LOG() << "getNumeralCodeHeader()"
|
||||
<< " HH: " << qbaHH << " size: " << qbaHH.size()
|
||||
<< " VH: " << qbaVH << " size: " << qbaVH.size();
|
||||
|
||||
|
||||
@@ -43,7 +43,4 @@ private Q_SLOTS:
|
||||
private:
|
||||
Ui::MainDialog *m_ui;
|
||||
NumeralCodeModel *m_numCodeModel;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
Reference in new issue
Block a user