BUILD_RTI conditional fixes and Qt6 API updates
- cmake/FindRTI.cmake: Add INTERFACE placeholder targets when RTI not found - cmake/FindRTI.cmake: Force BUILD_RTI=OFF when RTI not installed - Lts/Common/LtsSession/CMakeLists.txt: Make LtsSessionDataDds conditional on BUILD_RTI - Lts/Viewer/CMakeLists.txt: Make LtsDataView conditional on BUILD_RTI - Lts/Plugins/*/CMakeLists.txt: 97 plugin files wrapped in BUILD_RTI conditionals - cmake/NGLMacros.cmake: Fix NGL_ADD_BIG_RESOURCES macro (removed premature return()) - Multiple Qt6 API fixes: QLinkedList→std::list, QStringRef→QStringView, etc. - BUILD_RTI_FIXES_SUMMARY.md: Comprehensive documentation of all fixes Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2065 files changed
+48219
-1763
No files matched your search
@@ -1,7 +1,6 @@
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
|
||||
#include "ltssession_export.h"
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <DDS/Core/core_ftc.h>
|
||||
|
||||
@@ -11,8 +10,27 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
/*
|
||||
Anmerkungen:
|
||||
slotTryLock
|
||||
-> slotTryLock
|
||||
-> tryLockEntityRequest
|
||||
<- onTryLockEntityReply
|
||||
emit signalLockDialog | emit signalUnlockDialog
|
||||
|
||||
PpmGuiPlugin:
|
||||
- ParticipantOrganisationDialog (asSupportService==false)
|
||||
a) avoid disabling by overloading ::lock() -> yes
|
||||
b) use tryLockTopicNew -> yes
|
||||
|
||||
- ParticipantEdit (asSupportService==false||true)
|
||||
a) avoid disabling by overloading ::lock() -> yes
|
||||
b) use tryLockTopicNew -> yes
|
||||
|
||||
3 TacticalOrganisation
|
||||
-> left and right <-
|
||||
onReinitLeft, onReinitRight
|
||||
*/
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
@@ -31,7 +49,7 @@ public:
|
||||
public slots:
|
||||
void slotTryLock(const LtsWidgets::TopicInfo &topicInfo);
|
||||
bool slotUnlock();
|
||||
void slotFinalize();
|
||||
void slotFinalize(); // unlock, finally delete
|
||||
|
||||
signals:
|
||||
void signalLockDialog(const QString &lockedBy);
|
||||
@@ -45,12 +63,14 @@ private:
|
||||
std::shared_ptr<Core::Interface::Ftc> m_coreFtc;
|
||||
|
||||
LtsWidgets::TopicInfo m_topicInfo;
|
||||
int m_lockEntityId{0};
|
||||
int m_lockEntityId{0}; // reply.id(); / set by reply of ddsCall
|
||||
|
||||
int m_exerciseId{0};
|
||||
bool m_locked{false};
|
||||
bool m_askedForLock{false};
|
||||
bool m_askedForLock{false}; // reply does not tell..
|
||||
bool m_deleteAfterAnswer{false};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
@@ -83,4 +103,4 @@ private:
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
} // namespace LtsSession
|
||||
Reference in new issue
Block a user