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
+2
-2
@@ -14,9 +14,9 @@
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
namespace AdlerJson
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QWebSocket>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
#include "aes_handler.h"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
|
||||
#include "ppm_handler.h"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include "main_dispatcher.h"
|
||||
#include "logger.h"
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QTimer>
|
||||
|
||||
+2
-2
@@ -8,9 +8,9 @@
|
||||
#include <AreaEffectSimulation/aes.hpp>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QUrl>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
#include "ppm_handler.h"
|
||||
#include "aes_handler.h"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include "ppm_handler.h"
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "logger.h"
|
||||
#include "dds_handler.h"
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ ConvertToJsonFile::ConvertToJsonFile(const QString &txDir)
|
||||
: SendToTab()
|
||||
, m_bRetvalOnError(false)
|
||||
, m_txDir(txDir + QLatin1Char('/'))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("TAB.Plugin.ConvertToJsonFile"))
|
||||
.getNGLLogger("TAB.Plugin.ConvertToJsonFile"))
|
||||
{
|
||||
resetSendCounter();
|
||||
}
|
||||
|
||||
+2
-2
@@ -23,7 +23,7 @@ DirectoryCleaner::DirectoryCleaner(const QString &directory, unsigned int maxAge
|
||||
: QObject(parent)
|
||||
, m_cleanerThread(new QThread(this))
|
||||
, m_worker(new DirectoryCleanerWorker(directory, maxAgeSec))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("TAB.Plugin.DirectoryCleaner"))
|
||||
.getNGLLogger("TAB.Plugin.DirectoryCleaner"))
|
||||
{
|
||||
QDir().mkpath(directory);
|
||||
doInitialCleanup(directory);
|
||||
@@ -97,7 +97,7 @@ DirectoryCleanerWorker::DirectoryCleanerWorker(const QString &directory, unsigne
|
||||
: m_directory(directory)
|
||||
, m_maxAgeSec(maxAgeSec)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("TRA.Plugin.DirectoryCleaner"))
|
||||
.getNGLLogger("TRA.Plugin.DirectoryCleaner"))
|
||||
{}
|
||||
|
||||
void DirectoryCleanerWorker::onTimeout()
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "../TetraJson/convert_from_json.h"
|
||||
#include "convert_to_json_file.h"
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
class QTimer;
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
namespace HlaJson
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
namespace Nmea
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <QUdpSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
namespace Nmea
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFro
|
||||
const char *loggerName)
|
||||
: m_rxHandler(rxHandler)
|
||||
, m_bWarnedOnce(false)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName))
|
||||
.getNGLLogger(loggerName))
|
||||
{}
|
||||
|
||||
bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ ConvertToJson::ConvertToJson(const char *loggerName)
|
||||
: QObject()
|
||||
, SendToTab()
|
||||
, m_bConnected(false)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger(loggerName))
|
||||
.getNGLLogger(loggerName))
|
||||
{
|
||||
resetSendCounter();
|
||||
}
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataPro
|
||||
, m_prtCnvApp(nullptr)
|
||||
, m_exerciseId(0)
|
||||
, m_radioGrpId(0)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
|
||||
.getNGLLogger("TAB.Plugin.TetraJsonInterfaceImpl"))
|
||||
{
|
||||
N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter(
|
||||
settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool());
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ FromTab::FromTab(const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler
|
||||
, m_sendToDds(sendToDds)
|
||||
, m_uavIAManager(uavIAManager)
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("FromTab"))
|
||||
.getNGLLogger("FromTab"))
|
||||
{
|
||||
m_dtcPpm->enableUAS();
|
||||
m_dtcPpm->enableParticipant();
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
|
||||
namespace ProjectDataManagement { namespace Interface { class Dtc; } }
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <CentralEffectSimulation/ces_dtc.h>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <FileManagement/flm_dtc.h>
|
||||
#include <FileManagement/flm_ftc.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <QObject>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <LtsUtilsCore/json.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/recv_from_tab.h>
|
||||
#include <TmsIfAdapter/tms_if_adapter.h>
|
||||
#include <TmsIfAdapter/uav_commander.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
namespace WlsTetra
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <QTimer>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <PrtCnv/PrtCnvApplication.hpp>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "tetra_prtcnv.h"
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <QObject>
|
||||
#include <QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <DDS/Core/core_types.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
class QTimer;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include "logger.h"
|
||||
|
||||
Reference in new issue
Block a user