Migrates remaining proxies to generated rtiddsgen API
Converts accessor calls to plain member access in bld, cmo, gna, hla, whg and wls.
This commit is contained in:
34 files changed
+218
-214
No files matched your search
@@ -24,9 +24,9 @@ struct NasatAircraftParticipantEx final
|
||||
|
||||
std::shared_ptr<Participant2Dds> publisher() const { return m_publisher; }
|
||||
|
||||
int exerciseId() const { return m_nap.exerciseId(); }
|
||||
int exerciseId() const { return m_nap.exerciseId; }
|
||||
int partyId() const;
|
||||
int participantId() const { return m_nap.participantId(); }
|
||||
int participantId() const { return m_nap.participantId; }
|
||||
const NasatAircraftParticipant &participant() const { return m_nap; }
|
||||
|
||||
Q_DISABLE_COPY(NasatAircraftParticipantEx)
|
||||
@@ -84,6 +84,10 @@ private:
|
||||
|
||||
QHash<int, QHash<ExerciseParticipantKey, NasatAircraftParticipantEx*>> m_activePublisher;
|
||||
|
||||
// Qt5 declares m_logger in both classes of this header (Participant2Dds above and
|
||||
// HandlerParticipant here); the dedup pass kept only the first, so the uses in
|
||||
// handler_participant.cpp had no member. Restored to match the Qt5 declaration.
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
QHash<int, Core::GeoPosition> m_lastNasatPositionsAsCoreGeoposition;
|
||||
Initialization *m_mainHandler;
|
||||
|
||||
Reference in new issue
Block a user