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
+4
-5
@@ -32,7 +32,6 @@ ElokaDialog::ElokaDialog(LtsSession::LtsSession *session, AvaSession *avaSession
|
||||
, m_usedCnr()
|
||||
, m_usedTvc()
|
||||
, m_usedAnnouncement()
|
||||
, m_logger(getLogger("ElokaDialog"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
Q_ASSERT(avaSession);
|
||||
@@ -110,7 +109,7 @@ void ElokaDialog::setAvaSessionStatus(bool established)
|
||||
|
||||
void ElokaDialog::onAddClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onAddClicked() ";
|
||||
DEBUG_LOG() << "**** onAddClicked() ";
|
||||
|
||||
ElokaEditDialog *dialog = new ElokaEditDialog(m_session, m_avaSession, m_avmDtc, m_streamNameMapping,
|
||||
ElokaData(), this);
|
||||
@@ -129,7 +128,7 @@ void ElokaDialog::onAddClicked()
|
||||
|
||||
void ElokaDialog::onEditClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onEditClicked() ";
|
||||
DEBUG_LOG() << "**** onEditClicked() ";
|
||||
|
||||
const QModelIndex idx = m_ui->tvEloka->currentIndex();
|
||||
|
||||
@@ -155,7 +154,7 @@ void ElokaDialog::onEditClicked()
|
||||
|
||||
void ElokaDialog::onRemoveClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "**** onRemoveClicked() ";
|
||||
DEBUG_LOG() << "**** onRemoveClicked() ";
|
||||
|
||||
const QModelIndex idx = m_ui->tvEloka->currentIndex();
|
||||
|
||||
@@ -185,7 +184,7 @@ void ElokaDialog::onPrint()
|
||||
|
||||
void ElokaDialog::onQueryElokaResponse(const QVector<AvaEloka> &&eloka)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onQueryElokaResponse";
|
||||
DEBUG_LOG() << "onQueryElokaResponse";
|
||||
|
||||
m_elokaListCollector.start();
|
||||
m_elokaModel->clear();
|
||||
|
||||
+5
-6
@@ -110,7 +110,6 @@ ElokaEditDialog::ElokaEditDialog(LtsSession::LtsSession *session, AvaSession *av
|
||||
, m_tvcConfigMap()
|
||||
, m_announcementMap()
|
||||
, m_userProfile()
|
||||
, m_logger(getLogger("ElokaEditDialog"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
Q_ASSERT(avaSession);
|
||||
@@ -352,7 +351,7 @@ void ElokaEditDialog::getActiveCnrs()
|
||||
void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCnrConfigChanged";
|
||||
DEBUG_LOG() << "onCnrConfigChanged";
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
@@ -375,7 +374,7 @@ void ElokaEditDialog::onCnrConfigChanged(const CnrConfig &data,
|
||||
void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onTvcConfigChanged";
|
||||
DEBUG_LOG() << "onTvcConfigChanged";
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
@@ -399,7 +398,7 @@ void ElokaEditDialog::onTvcConfigChanged(const TvcConfig &data,
|
||||
void ElokaEditDialog::onStreamChanged(const Stream &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStreamChanged";
|
||||
DEBUG_LOG() << "onStreamChanged";
|
||||
|
||||
if ((data.type() != StreamType_def::AudioOut) &&
|
||||
(data.type() != StreamType_def::AudioInOut))
|
||||
@@ -428,7 +427,7 @@ void ElokaEditDialog::onCnrTvcProfileChanged(const CnrTvcProfile &data,
|
||||
DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType);
|
||||
DEBUG_LOG(m_logger) << "onCnrTvcProfileChanged";
|
||||
DEBUG_LOG() << "onCnrTvcProfileChanged";
|
||||
|
||||
if (data.exerciseId() != m_session->exerciseId() ||
|
||||
data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId())
|
||||
@@ -536,7 +535,7 @@ void ElokaEditDialog::setCurrentCircuit(const ElokaData &data)
|
||||
|
||||
void ElokaEditDialog::onGetElokaListResponse(const QVector<QString> &actions)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onGetElokaListResponse";
|
||||
DEBUG_LOG() << "onGetElokaListResponse";
|
||||
if (!m_elokaData.internalName.isEmpty())
|
||||
setUnchangeable(true);
|
||||
|
||||
|
||||
-1
@@ -20,7 +20,6 @@ ElokaModel::ElokaModel(LtsSession::LtsSession *session, QObject *parent)
|
||||
tr("Start Time")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("ElokaModel"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
|
||||
|
||||
Reference in new issue
Block a user