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
-2
@@ -17,7 +17,6 @@ AssignGuezNasatPartDialog::AssignGuezNasatPartDialog(int exerciseId, QWidget *pa
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_ui(new Ui::AssignGuezNasatPartDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -95,7 +94,7 @@ void AssignGuezNasatPartDialog::retranslate()
|
||||
|
||||
bool AssignGuezNasatPartDialog::apply()
|
||||
{
|
||||
INFO_LOG(m_logger) << "AssignGuezNasatPartDialog::apply()";
|
||||
INFO_LOG() << "AssignGuezNasatPartDialog::apply()";
|
||||
int32_t participantId = m_ui->cmbParticipants->currentData().toInt();
|
||||
int32_t nasatAircraftId = m_ui->cmbNasats->currentData().toInt();
|
||||
|
||||
|
||||
+6
-7
@@ -20,7 +20,6 @@ GuezNasatPartDialog::GuezNasatPartDialog(const QString &menuGroup, LtsSession::L
|
||||
, m_ui(new Ui::GuezNasatPartDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -46,7 +45,7 @@ bool GuezNasatPartDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc>
|
||||
m_exmDtc = exmDtc;
|
||||
m_ppmDtc = ppmDtc;
|
||||
|
||||
INFO_LOG(m_logger) << "GuezNasatPartDialog::init";
|
||||
INFO_LOG() << "GuezNasatPartDialog::init";
|
||||
m_nasatAircraftParticipantModel = new GuezNasat::NasatAircraftParticipantModel(this);
|
||||
m_nasatAircraftParticipantModel->initModel(m_dtc, m_exmDtc, m_ppmDtc, ppmGuiCbxIfc, m_session);
|
||||
m_ui->widget->setModel(m_nasatAircraftParticipantModel);
|
||||
@@ -90,11 +89,11 @@ void GuezNasatPartDialog::retranslate()
|
||||
|
||||
void GuezNasatPartDialog::onNewAircraftPart()
|
||||
{
|
||||
INFO_LOG(m_logger) << "onNewAircraft";
|
||||
INFO_LOG() << "onNewAircraft";
|
||||
AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
|
||||
if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel))
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
|
||||
ERROR_LOG() << QLatin1String("Can't initialize AssignGuezNasatPartDialog!");
|
||||
delete assignGuezNasatPartDialog;
|
||||
return;
|
||||
}
|
||||
@@ -108,11 +107,11 @@ void GuezNasatPartDialog::onEditAircraftPart()
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onEditAircraft";
|
||||
INFO_LOG() << "onEditAircraft";
|
||||
AssignGuezNasatPartDialog *assignGuezNasatPartDialog = new AssignGuezNasatPartDialog(m_session->exerciseId(), this);
|
||||
if (!assignGuezNasatPartDialog->init(m_ftc, m_nasatAircraftParticipantModel, m_nasatAircraftParticipantModel->getRowData(curIdx.row())))
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
|
||||
ERROR_LOG() << QLatin1String("Can't initialize assignGuezNasatPartDialog!");
|
||||
delete assignGuezNasatPartDialog;
|
||||
return;
|
||||
}
|
||||
@@ -131,7 +130,7 @@ void GuezNasatPartDialog::onRemoveAircraftPart()
|
||||
const QModelIndex curIdx = m_ui->widget->currentIndex();
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
INFO_LOG(m_logger) << "onRemoveNewAircraft";
|
||||
INFO_LOG() << "onRemoveNewAircraft";
|
||||
|
||||
NasatAircraftParticipant req;
|
||||
req.id(m_nasatAircraftParticipantModel->getRowData(curIdx.row()).id());
|
||||
|
||||
+1
-2
@@ -21,7 +21,6 @@ NasatAircraftModel::NasatAircraftModel(QObject *parent)
|
||||
},
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(getLogger("NasatAircraftModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -43,7 +42,7 @@ bool NasatAircraftModel::initModel(const std::shared_ptr<GuezNasat::Interface::D
|
||||
|
||||
QVariant NasatAircraftModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
INFO_LOG(m_logger) << "NasatAircraftModel::data";
|
||||
INFO_LOG() << "NasatAircraftModel::data";
|
||||
|
||||
if (role != Qt::DisplayRole || !indexIsValid(index))
|
||||
return QVariant();
|
||||
|
||||
+1
-3
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Common/gnacommon_export.h>
|
||||
#include "gnacommon_export.h"
|
||||
#include <GuezNasat/gna_dtc.h>
|
||||
#include <GuezNasat/logger.h>
|
||||
|
||||
@@ -34,7 +34,5 @@ public:
|
||||
|
||||
private:
|
||||
std::shared_ptr<GuezNasat::Interface::Dtc> m_dtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+8
-9
@@ -22,7 +22,6 @@ NasatAircraftParticipantModel::NasatAircraftParticipantModel(QObject *parent)
|
||||
tr("Participant")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("NasatAircraftParticipantModel"))
|
||||
{}
|
||||
|
||||
|
||||
@@ -40,7 +39,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
|
||||
|
||||
|
||||
const QMap<qint32, GuezNasat::NasatAircraftParticipant> nasatAircraftParticipants = m_dtc->nasatAircraftParticipants();
|
||||
INFO_LOG(m_logger) << "initModel - #NasatAircraftParticipantModel: " << nasatAircraftParticipants.size() ;
|
||||
INFO_LOG() << "initModel - #NasatAircraftParticipantModel: " << nasatAircraftParticipants.size() ;
|
||||
|
||||
connect(m_dtc.get(), &Interface::Dtc::nasatAircraftParticipantChanged,
|
||||
this, &NasatAircraftParticipantModel::onNasatAircraftParticipantChanged);
|
||||
@@ -84,7 +83,7 @@ bool NasatAircraftParticipantModel::initModel(const std::shared_ptr<GuezNasat::I
|
||||
|
||||
QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role) const
|
||||
{
|
||||
INFO_LOG(m_logger) << "NasatAircraftParticipantModel::data";
|
||||
INFO_LOG() << "NasatAircraftParticipantModel::data";
|
||||
|
||||
if ((role != Qt::DisplayRole && role != Qt::DecorationRole) || !indexIsValid(index))
|
||||
return QVariant();
|
||||
@@ -101,7 +100,7 @@ QVariant NasatAircraftParticipantModel::data(const QModelIndex &index, int role)
|
||||
switch (index.column())
|
||||
{
|
||||
case Id:
|
||||
INFO_LOG(m_logger) << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
|
||||
INFO_LOG() << "nasatAircraftParticipant.id()=" << nasatAircraftParticipant.id();
|
||||
return nasatAircraftParticipant.id();
|
||||
case NasatAircreaftId:
|
||||
return nasatAircraftParticipant.nasatAircraftId();
|
||||
@@ -159,7 +158,7 @@ void NasatAircraftParticipantModel::onNasatAircraftParticipantChanged(const Guez
|
||||
void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::Exercise &data,
|
||||
const DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onExerciseChanged: " << data << ", " << modType;
|
||||
INFO_LOG() << "onExerciseChanged: " << data << ", " << modType;
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
@@ -176,7 +175,7 @@ void NasatAircraftParticipantModel::onExerciseChanged(const ExerciseManagement::
|
||||
void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::Type &data,
|
||||
const DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onTypeChanged:" << data << ", " << modType;
|
||||
INFO_LOG() << "onTypeChanged:" << data << ", " << modType;
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
@@ -193,7 +192,7 @@ void NasatAircraftParticipantModel::onTypeChanged(const ParticipantManagement::T
|
||||
void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManagement::Participant &data,
|
||||
DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onParticipantChanged: " << data << ", " << modType;
|
||||
INFO_LOG() << "onParticipantChanged: " << data << ", " << modType;
|
||||
|
||||
if (data.isDeleted())
|
||||
modType = DataModification::eRemoved;
|
||||
@@ -205,7 +204,7 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
|
||||
case DataModification::eModified:
|
||||
case DataModification::eAdded:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DataModification::eAdded Participant"
|
||||
DEBUG_LOG() << "DataModification::eAdded Participant"
|
||||
<< " TypeId=" << data.typeId()
|
||||
<< " " << data.name();
|
||||
|
||||
@@ -229,7 +228,7 @@ void NasatAircraftParticipantModel::onParticipantChanged(const ParticipantManage
|
||||
void NasatAircraftParticipantModel::onNasatAircraftChanged(const GuezNasat::NasatAircraft &data,
|
||||
const DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onNasatAircraftChanged: " << data << ", " << modType;
|
||||
DEBUG_LOG() << "onNasatAircraftChanged: " << data << ", " << modType;
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eRemoved:
|
||||
|
||||
+2
-3
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <Common/gnacommon_export.h>
|
||||
#include "gnacommon_export.h"
|
||||
#include <GuezNasat/gna_dtc.h>
|
||||
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
@@ -81,7 +81,6 @@ private:
|
||||
QHash <int, QString> m_nasatNames;
|
||||
QHash <int, QString> m_participantHierarchies;
|
||||
QHash <int, QPixmap> m_participantDecorations;
|
||||
QHash <int, ParticipantManagement::TypeClass> m_typeToTypeClass;
|
||||
LOGGER_T m_logger;
|
||||
QHash <int, ParticipantManagement::TypeClass> m_typeToTypeClass;
|
||||
};
|
||||
}
|
||||
@@ -18,7 +18,6 @@ GuezNasatDialog::GuezNasatDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_ui(new Ui::GuezNasatDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -36,7 +35,7 @@ bool GuezNasatDialog::init(const std::shared_ptr<GuezNasat::Interface::Ftc> &ftc
|
||||
m_ftc = ftc;
|
||||
m_dtc = dtc;
|
||||
|
||||
INFO_LOG(m_logger) << "GuezNasatDialog::init";
|
||||
INFO_LOG() << "GuezNasatDialog::init";
|
||||
m_nasatAircraftModel = new GuezNasat::NasatAircraftModel(this);
|
||||
m_nasatAircraftModel->initModel(m_dtc);
|
||||
m_ui->widget->setModel(m_nasatAircraftModel);
|
||||
@@ -75,11 +74,11 @@ void GuezNasatDialog::retranslate()
|
||||
|
||||
void GuezNasatDialog::onNewAircraft()
|
||||
{
|
||||
INFO_LOG(m_logger) << "onNewAircraft";
|
||||
INFO_LOG() << "onNewAircraft";
|
||||
NewGuezNasatDialog *newGuezNasatDialog = new NewGuezNasatDialog(this);
|
||||
if (!newGuezNasatDialog->init(m_ftc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can't initialize NewGuezNasatDialog!";
|
||||
ERROR_LOG() << "Can't initialize NewGuezNasatDialog!";
|
||||
delete newGuezNasatDialog;
|
||||
return;
|
||||
}
|
||||
@@ -94,11 +93,11 @@ void GuezNasatDialog::onEditAircraft()
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "onEditAircraft";
|
||||
INFO_LOG() << "onEditAircraft";
|
||||
NewGuezNasatDialog *editGuezNasatDialog = new NewGuezNasatDialog(this);
|
||||
if (!editGuezNasatDialog->init(m_ftc, m_nasatAircraftModel->getRowData(curIdx.row())))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can't initialize NewGuezNasatDialog!";
|
||||
ERROR_LOG() << "Can't initialize NewGuezNasatDialog!";
|
||||
delete editGuezNasatDialog;
|
||||
return;
|
||||
}
|
||||
@@ -118,7 +117,7 @@ void GuezNasatDialog::onRemoveAircraft()
|
||||
if (!curIdx.isValid())
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "onRemoveNewAircraft";
|
||||
INFO_LOG() << "onRemoveNewAircraft";
|
||||
NasatAircraft req;
|
||||
req.id(m_nasatAircraftModel->getRowData(curIdx.row()).id());
|
||||
|
||||
|
||||
-1
@@ -14,7 +14,6 @@ NewGuezNasatDialog::NewGuezNasatDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_ui(new Ui::NewGuezNasatDialog)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("Dialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user