Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
@@ -0,0 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Forward-Declarations
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
class Ftc;
|
||||
} // namespace Interface
|
||||
} // namespace Buildings
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
// Stub file for bld_enums.hpp - used when BUILD_RTI=OFF
|
||||
#ifndef BLD_ENUMS_HPP
|
||||
#define BLD_ENUMS_HPP
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace Buildings {
|
||||
|
||||
enum class BuildingType : std::int32_t {
|
||||
Residential = 0,
|
||||
Commercial = 1,
|
||||
Industrial = 2
|
||||
};
|
||||
|
||||
enum class BuildingStatus : std::int32_t {
|
||||
Active = 0,
|
||||
Inactive = 1,
|
||||
UnderConstruction = 2
|
||||
};
|
||||
|
||||
struct BuildingInfo {
|
||||
int id = 0;
|
||||
double x = 0.0;
|
||||
double y = 0.0;
|
||||
double z = 0.0;
|
||||
};
|
||||
|
||||
} // namespace Buildings
|
||||
|
||||
#endif // BLD_ENUMS_HPP
|
||||
Reference in new issue
Block a user