AlarmManagement: DataModification-Namespace und Export-Macro korrigiert
- SVCALMCOMMON_EXPORT in logger.h verwendet (statt ALM_COMMON_EXPORT) - Include für alm_types.h in alm_config_alarm_model.h hinzugefügt - Include für data_modification_enum.h in allen AlarmManagement-Modellen hinzugefügt - DataModification → Lts::DataModification in allen Gui-Modellen korrigiert - GuezNasat gna_dtc.h: Include für data_modification_enum.h hinzugefügt
This commit is contained in:
6 files changed
+44
-38
No files matched your search
@@ -7,6 +7,7 @@
|
||||
#include "gna_nasat_aircraft_participant.h"
|
||||
#include "../ParticipantManagement/ppm_enums.hpp"
|
||||
#include "../ParticipantManagement/ppm.hpp"
|
||||
#include "../../Lts/Common/LtsUtils/LtsUtilsCore/data_modification_enum.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QList>
|
||||
@@ -71,14 +72,14 @@ public:
|
||||
// Daten hinzufügen/entfernen/ändern
|
||||
void addNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
|
||||
m_nasatAircraftParticipants.append(nap);
|
||||
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eAdded);
|
||||
emit nasatAircraftParticipantChanged(nap, DataModification::eAdded);
|
||||
}
|
||||
|
||||
void updateNasatAircraftParticipant(const NasatAircraftParticipant& nap) {
|
||||
for (auto& existing : m_nasatAircraftParticipants) {
|
||||
if (existing.id() == nap.id()) {
|
||||
existing = nap;
|
||||
emit nasatAircraftParticipantChanged(nap, ParticipantManagement::DataModification::eModified);
|
||||
emit nasatAircraftParticipantChanged(nap, DataModification::eModified);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -90,7 +91,7 @@ public:
|
||||
if (it->id() == id) {
|
||||
NasatAircraftParticipant removed = *it;
|
||||
m_nasatAircraftParticipants.erase(it);
|
||||
emit nasatAircraftParticipantChanged(removed, ParticipantManagement::DataModification::eRemoved);
|
||||
emit nasatAircraftParticipantChanged(removed, DataModification::eRemoved);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -98,14 +99,14 @@ public:
|
||||
|
||||
void addNasatAircraft(const NasatAircraft& na) {
|
||||
m_nasatAircrafts.append(na);
|
||||
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eAdded);
|
||||
emit nasatAircraftChanged(na, DataModification::eAdded);
|
||||
}
|
||||
|
||||
void updateNasatAircraft(const NasatAircraft& na) {
|
||||
for (auto& existing : m_nasatAircrafts) {
|
||||
if (existing.id() == na.id()) {
|
||||
existing = na;
|
||||
emit nasatAircraftChanged(na, ParticipantManagement::DataModification::eModified);
|
||||
emit nasatAircraftChanged(na, DataModification::eModified);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -117,15 +118,15 @@ public:
|
||||
if (it->id() == id) {
|
||||
NasatAircraft removed = *it;
|
||||
m_nasatAircrafts.erase(it);
|
||||
emit nasatAircraftChanged(removed, ParticipantManagement::DataModification::eRemoved);
|
||||
emit nasatAircraftChanged(removed, DataModification::eRemoved);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
signals:
|
||||
void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, ParticipantManagement::DataModification modificationType);
|
||||
void nasatAircraftChanged(const NasatAircraft& aircraft, ParticipantManagement::DataModification modificationType);
|
||||
void nasatAircraftParticipantChanged(const NasatAircraftParticipant& participant, DataModification modificationType);
|
||||
void nasatAircraftChanged(const NasatAircraft& aircraft, DataModification modificationType);
|
||||
|
||||
private:
|
||||
QList<NasatAircraftParticipant> m_nasatAircraftParticipants;
|
||||
|
||||
Reference in new issue
Block a user