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
@@ -9,6 +9,14 @@ IF(BUILD_RTI)
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
# Resolve <DDS/...> includes (generic_data_reader.h, generic_dtc.h, ...) to the
|
||||
# real headers under Lts/DDS/ instead of the migration stub tree in include/.
|
||||
# The generated core_dtc_impl.h relies on GenericDtc::TopicType, which only the
|
||||
# real DDSGeneric::GenericDataReader base provides — the stub variant lacks it.
|
||||
# Same fix the migrated service CMakeLists (FileManagement/FilterManagement)
|
||||
# already enforce; svcFileManagement links svcCoreClient, so Core must build.
|
||||
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/Lts)
|
||||
|
||||
SET(xml_FILE core.xml)
|
||||
|
||||
#
|
||||
@@ -111,13 +119,11 @@ SET(SRCS_client
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCoreClient SHARED ${SRCS_client})
|
||||
|
||||
# Add compile definition for export macros
|
||||
TARGET_COMPILE_DEFINITIONS(svcCoreClient
|
||||
PRIVATE
|
||||
MAKE_SVCCORECLIENT_LIB
|
||||
)
|
||||
|
||||
# NGL_ADD_LIBRARY2 (unlike NGL_ADD_LIBRARY) does not define the
|
||||
# MAKE_<SYMBOL>_LIB compile guard, but the generated core_[d|f]tc_impl.h
|
||||
# headers require MAKE_SVCCORECLIENT_LIB — same situation as ddscore above,
|
||||
# which defines MAKE_DDSCORE_LIB explicitly for the same reason.
|
||||
TARGET_COMPILE_DEFINITIONS(svcCoreClient PRIVATE MAKE_SVCCORECLIENT_LIB)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
|
||||
@@ -59,9 +59,9 @@ void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, cons
|
||||
|
||||
void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
|
||||
{
|
||||
if (!m_state.ports.has_value())
|
||||
if (!m_state.ports.is_set())
|
||||
m_state.ports = std::vector<Core::PortInformation>();
|
||||
m_state.ports.value().push_back(Core::PortInformation(number, portType, properties.toStdString()));
|
||||
m_state.ports.get().push_back(Core::PortInformation(number, portType, properties.toStdString()));
|
||||
|
||||
publishState();
|
||||
}
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
#include <Core/core_export.h>
|
||||
|
||||
#if BUILD_RTI
|
||||
// Resolves to the codegen-generated core_dtc.h via the build-dir include
|
||||
// root (build4/Lts). The old <Core/core_dtc.h> spelling hit the migration
|
||||
// stub tree (include/Core/core_dtc.h), whose DDS::Core::Interface forward
|
||||
// declarations don't match the generated Core::Interface::Dtc.
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#else
|
||||
// Forward declarations for moc compatibility when BUILD_RTI=OFF
|
||||
@@ -66,7 +70,9 @@ public:
|
||||
template<typename E>
|
||||
bool isLocked(const E &data, int exerciseId)
|
||||
{
|
||||
auto it = m_lockedEntitys.constFind(key(data.id(), exerciseId, QString::fromStdString(typeid(E).name())));
|
||||
// rtiddsgen -stl generates plain public data members, so the id is
|
||||
// accessed directly instead of the old getter call data.id().
|
||||
auto it = m_lockedEntitys.constFind(key(data.id, exerciseId, QString::fromStdString(typeid(E).name())));
|
||||
return !(it == m_lockedEntitys.cend());
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user