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
@@ -69,7 +69,6 @@ EditTrainingVoiceCommunicationDialog::EditTrainingVoiceCommunicationDialog(int32
|
||||
, m_avmFtc(avmFtc)
|
||||
, m_exmDtc(exmDtc)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("EditTrainingVoiceCommunicationDialog"))
|
||||
{
|
||||
Q_ASSERT(id >= 0);
|
||||
Q_ASSERT(exmDtc);
|
||||
|
||||
-2
@@ -106,7 +106,5 @@ private:
|
||||
ExerciseManagement::Interface::Dtc *m_exmDtc;
|
||||
QVector<QString> m_takenNames;
|
||||
std::unique_ptr<LtsUtils::RequestHelper> m_requestHelper;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+6
-7
@@ -24,7 +24,6 @@ TrainingVoiceCommunicationDialog::TrainingVoiceCommunicationDialog(const QString
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_avmDtc(nullptr)
|
||||
, m_avmFtc(nullptr)
|
||||
, m_logger(getLogger("TrainingVoiceCommunicationDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -53,7 +52,7 @@ bool TrainingVoiceCommunicationDialog::init(const std::shared_ptr<Interface::Dtc
|
||||
avmFtc->enableModifyTvcConfig() &&
|
||||
avmFtc->enableRemoveTvcConfig()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Could not enable topics";
|
||||
ERROR_LOG() << "Could not enable topics";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -69,7 +68,7 @@ bool TrainingVoiceCommunicationDialog::init(const std::shared_ptr<Interface::Dtc
|
||||
{
|
||||
m_filter.reset();
|
||||
m_model.reset();
|
||||
ERROR_LOG(m_logger) << "Could not init model";
|
||||
ERROR_LOG() << "Could not init model";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -168,14 +167,14 @@ void TrainingVoiceCommunicationDialog::onExportButtonClicked()
|
||||
|
||||
int fileId = m_flmGui->saveFileContent(this, FileManagement::FileType::Xml, m_session->exerciseId(), byteArray);
|
||||
if (fileId > 0)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
DEBUG_LOG() << "Saved file with id = " << fileId;
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Could not save file in library ";
|
||||
ERROR_LOG() << "Could not save file in library ";
|
||||
}
|
||||
|
||||
void TrainingVoiceCommunicationDialog::onImportButtonClicked()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << " onImportButtonClicked() ";
|
||||
DEBUG_LOG() << " onImportButtonClicked() ";
|
||||
|
||||
QByteArray content;
|
||||
int fileId = m_flmGui->loadFileContent(this, content, {FileManagement::FileType::Xml}, m_session->exerciseId(), FileManagement::toString(FileManagement::XmlType::AVMTrainingVoiceCommunication));
|
||||
@@ -202,7 +201,7 @@ void TrainingVoiceCommunicationDialog::onImportButtonClicked()
|
||||
});
|
||||
}
|
||||
(void) m_requestHelper->startRequests();
|
||||
INFO_LOG(m_logger) << "--- onImportButtonClicked() ";
|
||||
INFO_LOG() << "--- onImportButtonClicked() ";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
-2
@@ -86,7 +86,5 @@ private:
|
||||
std::shared_ptr<Interface::Ftc> m_avmFtc;
|
||||
std::shared_ptr<FileManagement::ForeignGuiInterface> m_flmGui;
|
||||
ExerciseManagement::Interface::Dtc *m_exmDtc{nullptr};
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -21,7 +21,6 @@ TrainingVoiceCommunicationDialogModel::TrainingVoiceCommunicationDialogModel(QOb
|
||||
tr("Global")
|
||||
}, parent)
|
||||
, m_exerciseId(-1)
|
||||
, m_logger(getLogger("TrainingVoiceCommunicationDialogModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -114,7 +113,7 @@ QVector<ModifyTvcConfigRequest> TrainingVoiceCommunicationDialogModel::jsonToTvc
|
||||
config.recording(obj[QLatin1String("recording")].toBool());
|
||||
config.tetraChannelId(obj[QLatin1String("tetraChannelId")].toInt());
|
||||
|
||||
INFO_LOG(m_logger) << "insertRow: " << config.radioCircuit()
|
||||
INFO_LOG() << "insertRow: " << config.radioCircuit()
|
||||
<< " tvcChannelId=" << config.tetraChannelId();
|
||||
result.push_back(std::move(config));
|
||||
}
|
||||
|
||||
-2
@@ -39,8 +39,6 @@ private:
|
||||
int32_t m_exerciseId;
|
||||
|
||||
QMap<int32_t, AudioVideoManagement::TvcChannel> m_tetraChannels;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user