Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,72 @@
|
||||
/**
|
||||
* Handler ShootbackTargets (L400)
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by N. Thoden, NLE, 06.04.2020
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <TargetManagement/tgt_dts.h>
|
||||
|
||||
|
||||
namespace TargetManagement
|
||||
{
|
||||
class MainHandler;
|
||||
class ObjectShootbackTarget;
|
||||
|
||||
class HandlerShootbackTarget final
|
||||
: public QObject
|
||||
, protected Interface::Fts::ShootbackTargetModifyRequestHandler
|
||||
, protected Interface::Fts::ShootbackTargetRemoveRequestHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
explicit HandlerShootbackTarget(MainHandler *mainHandler);
|
||||
~HandlerShootbackTarget();
|
||||
|
||||
/**
|
||||
* Initialize the handler to manage information
|
||||
*/
|
||||
bool init();
|
||||
|
||||
const QHash<int, ObjectShootbackTarget *> &getObjectMap() const { return m_objectMap; }
|
||||
|
||||
ObjectShootbackTarget *data(int id)
|
||||
{
|
||||
if (!m_objectMap.contains(id))
|
||||
return nullptr;
|
||||
return m_objectMap[id];
|
||||
}
|
||||
|
||||
ObjectShootbackTarget *dataForTargetParticipantId(int targetParticipantId) const;
|
||||
int targetDataIdForTargetParticipantId(int targetParticipantId) const;
|
||||
|
||||
Q_SIGNALS:
|
||||
void objectChanged(qint32 objId, bool removed);
|
||||
|
||||
private Q_SLOTS:
|
||||
|
||||
private: // methods
|
||||
void onShootbackTargetModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ShootbackTarget &request) override;
|
||||
Core::FunctionReplyObject shootbackTargetModifyRequest(const ShootbackTarget &request);
|
||||
void onShootbackTargetRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request) override;
|
||||
|
||||
private: // attributes
|
||||
|
||||
QHash<int, ObjectShootbackTarget *> m_objectMap;
|
||||
MainHandler *m_mainHandler;
|
||||
std::shared_ptr<TargetManagement::Interface::Dts> m_dtsTgt;
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
|
||||
};
|
||||
} // namespace TargetManagement
|
||||
|
||||
Reference in new issue
Block a user