LtsSession/LtsElevation: BUILD_RTI Guards komplett, EXTERNAL_DEPENDENCIES.md
- lts_session_data_dds.h/cpp: Vollständig mit #ifdef BUILD_RTI geschützt Vermeidet vtable/qt_metacast Linker-Fehler bei BUILD_RTI=OFF - lts_session.cpp: LtsSessionDataDds-Aufrufe mit BUILD_RTI Guards toString(): N/A-Placeholder im else-Zweig event(): QObject::event(e) statt LtsSessionDataDds::event(e) - lts_elevation_manager.cpp: - m_logger im Initializer-List initialisieren (Reference-Member) - initDDS: Kein Zugriff auf incomplete type bei BUILD_RTI=OFF - createInstance: Rückgabetyp korrigiert (nullptr statt QStringList) - getFilenamesForExercise/TrainingArea: #ifdef BUILD_RTI - exerciseIdToTrainingAreaId: static method mit BUILD_RTI guard - elevation_map_manager.h: QPoint3D-STUB entfernt, Forward-Declaration - cnr_frequency_planning_helper.h/cpp: Vollständig mit BUILD_RTI geschützt - EXTERNAL_DEPENDENCIES.md: Dokumentation fehlender external deps - RTI GCC-Inkompatibilität (DDS_OctetSeq vs DDS_OctetsSeq) - BUILD_RTI temporär OFF, BUILD_ARCGIS=ON default Build-Status: LtsSession [17/1589] erfolgreich, LtsElevation gebaut Offene Build-Fehler durch fehlende externe Dependencies (erwartet)
This commit is contained in:
8 files changed
+68
-80
No files matched your search
@@ -160,6 +160,7 @@ QString LtsSession::toString() const
|
||||
str.append(QStringLiteral(", LtsSessionDataDds=%1").arg(LtsSessionDataDds::toString()));
|
||||
#else
|
||||
str.append(QStringLiteral(", app=Login (stub)"));
|
||||
str.append(QStringLiteral(", partitionType=N/A, exerciseId=N/A"));
|
||||
#endif
|
||||
return str;
|
||||
}
|
||||
@@ -1124,8 +1125,10 @@ bool LtsSession::event(QEvent* e)
|
||||
#else
|
||||
bool LtsSession::event(QEvent* e)
|
||||
{
|
||||
Q_UNUSED(e)
|
||||
return LtsSessionDataDds::event(e);
|
||||
if (e->type() == QEvent::LanguageChange)
|
||||
m_baseLayout->setAppName(appToString(app()));
|
||||
|
||||
return QObject::event(e);
|
||||
}
|
||||
#endif // BUILD_RTI
|
||||
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
* Created by Christian Ehrlicher, SLSE, 2017-02-27
|
||||
*/
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
|
||||
#include "lts_session_data_dds.h"
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
@@ -385,3 +387,5 @@ void LtsSessionDataDds::addAvailablaeDataPluginInterfaces(
|
||||
}
|
||||
|
||||
} // namespace LtsSession
|
||||
|
||||
#endif // BUILD_RTI
|
||||
@@ -10,9 +10,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
// Stub implementation when BUILD_RTI=OFF - NOT SUPPORTED ANYMORE
|
||||
// RTI Connext DDS is required but not yet integrated in build
|
||||
// This file provides minimal stub to allow compilation
|
||||
#ifdef BUILD_RTI
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
@@ -103,3 +101,5 @@ signals:
|
||||
};
|
||||
|
||||
} // namespace LtsSession
|
||||
|
||||
#endif // BUILD_RTI
|
||||
Reference in new issue
Block a user