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
@@ -55,7 +55,6 @@ private:
|
||||
QSet<int> m_aesInTetraAvailable;
|
||||
std::shared_ptr<DatabaseInterface> m_dbInterface;
|
||||
int m_exerciseId;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -167,7 +166,7 @@ private:
|
||||
if (it == cont.end())
|
||||
{
|
||||
cont.emplace(std::make_pair(data.id(), std::move(dataTmp)));
|
||||
DEBUG_LOG(m_logger) << "new AES Item: " << data;
|
||||
DEBUG_LOG() << "new AES Item: " << data;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -179,7 +178,7 @@ private:
|
||||
|
||||
if (it->second == dataTmp)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "nothing changed for AES Item: " << data;
|
||||
DEBUG_LOG() << "nothing changed for AES Item: " << data;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -191,7 +190,7 @@ private:
|
||||
|
||||
std::swap(it->second, dataTmp);
|
||||
|
||||
DEBUG_LOG(m_logger) << "changed AES Item: " << data;
|
||||
DEBUG_LOG() << "changed AES Item: " << data;
|
||||
return true;
|
||||
}
|
||||
bool dataChanged(const AreaEffectSimulation::AirSupportImpact ¤t, bool &onlyNameChanged)
|
||||
@@ -334,7 +333,7 @@ private:
|
||||
m_sentAesTelegrams.push_back(new T(tele));
|
||||
m_sentAesTelegramsAesIds.push_back(tele.aesDdsId);
|
||||
m_checkOutdatedTelegramsTimer->start();
|
||||
DEBUG_LOG(m_logger) << "Appending " << tele.type()<< " to m_sentAesTelegrams";
|
||||
DEBUG_LOG() << "Appending " << tele.type()<< " to m_sentAesTelegrams";
|
||||
}
|
||||
|
||||
void onCheckOutdatedTelegrams();
|
||||
@@ -376,8 +375,6 @@ private:
|
||||
|
||||
QVector<TetraIcd::TrainingAreaTelegram*> m_sentAesTelegrams;
|
||||
QVector<int> m_sentAesTelegramsAesIds;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user