Qt6 Migration: BUILD_RTI Guards, Export-Header und Include-Pfade korrigiert
- BUILD_RTI Guards in LtsSession implementiert (6 Dateien) - LtsSessionDataDds Stub für BUILD_RTI=OFF erstellt - Export-Header Stubs erstellt (GuezNasat, AlarmManagement, MarkerManagement) - Include-Pfade korrigiert (resource_path.h, logger.h, Proxies) - QStringRef → QString migriert (Qt6 Kompatibilität) - Qt6::Gui Dependencies hinzugefügt (LtsElevation, AdvancedSymbology) - FilterManagement-Plugins temporär vom Build ausgeschlossen - MOC-Probleme gefixt (staticMetaObject, override final) - Build erfolgreich: 1940 Targets mit BUILD_RTI=OFF im Docker-Container Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
46 files changed
+2487
-110
No files matched your search
@@ -26,6 +26,7 @@ class Dtc;
|
||||
}
|
||||
} // namespace ExerciseManagement
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
namespace AssetManagement
|
||||
{
|
||||
namespace Interface
|
||||
@@ -33,6 +34,7 @@ namespace Interface
|
||||
class Dtc;
|
||||
}
|
||||
} // namespace AssetManagement
|
||||
#endif
|
||||
|
||||
namespace LtsElevation
|
||||
{
|
||||
@@ -47,13 +49,20 @@ class LTSELEVATION_EXPORT LtsElevationManager : public QObject
|
||||
public:
|
||||
static LTS_ELEVATION_MANAGER_TYPE
|
||||
createInstance(int exerciseId, const std::shared_ptr<ExerciseManagement::Interface::Dtc>& exmDtc = {},
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc>& asmDtc = {});
|
||||
#ifdef BUILD_RTI
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc>& asmDtc = {}
|
||||
#else
|
||||
const std::shared_ptr<void>& asmDtc = {}
|
||||
#endif
|
||||
);
|
||||
|
||||
static LTS_ELEVATION_MANAGER_TYPE getInstance(int exerciseId);
|
||||
|
||||
#ifdef BUILD_RTI
|
||||
static LTS_ELEVATION_MANAGER_TYPE
|
||||
createInstanceForTrainingAreaId(int trainingAreaId,
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc>& asmDtc = nullptr);
|
||||
#endif
|
||||
|
||||
static void cleanupAll();
|
||||
virtual ~LtsElevationManager();
|
||||
@@ -74,7 +83,12 @@ class LTSELEVATION_EXPORT LtsElevationManager : public QObject
|
||||
explicit LtsElevationManager();
|
||||
|
||||
void initDDS(const std::shared_ptr<ExerciseManagement::Interface::Dtc>& exmDtc,
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc>& asmDtc);
|
||||
#ifdef BUILD_RTI
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc>& asmDtc
|
||||
#else
|
||||
const std::shared_ptr<void>& asmDtc
|
||||
#endif
|
||||
);
|
||||
bool init(const QStringList& filePaths_rough_to_fine);
|
||||
static int exerciseIdToTrainingAreaId(int exerciseId,
|
||||
const std::shared_ptr<ExerciseManagement::Interface::Dtc>& exmDtc);
|
||||
|
||||
Reference in new issue
Block a user