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,76 @@
|
||||
/**
|
||||
* CES Plugin Interface
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Gerlinde Rudolphus, SLTE, 2016-04-14
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <CentralEffectSimulation/ces_db.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
class Settings;
|
||||
}
|
||||
|
||||
namespace NGLDB
|
||||
{
|
||||
template <typename DB> class DbServiceHandler;
|
||||
}
|
||||
|
||||
namespace CentralEffectSimulation
|
||||
{
|
||||
using DbHandler = NGLDB::DbServiceHandler<DatabaseInterface>;
|
||||
|
||||
class MainHandler;
|
||||
class DdsHandler;
|
||||
//class DbHandler;
|
||||
class DatabaseInterface;
|
||||
class HandlerParticipant;
|
||||
class HandlerBuildingData;
|
||||
namespace Plugin
|
||||
{
|
||||
|
||||
class Interface;
|
||||
class DataProvider
|
||||
{
|
||||
public:
|
||||
DataProvider() = default;
|
||||
virtual ~DataProvider() = default;
|
||||
};
|
||||
|
||||
class Plugin
|
||||
{
|
||||
public:
|
||||
Plugin() = default;
|
||||
virtual ~Plugin() = default;
|
||||
virtual std::shared_ptr<Interface> createInterface(DataProvider *pdp,
|
||||
const std::shared_ptr<DDSConnector::DdsConnector> &dDSConnector,
|
||||
NGL::Settings *settings,
|
||||
MainHandler *mainHandler) = 0;
|
||||
};
|
||||
|
||||
class Interface: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Interface() = default;
|
||||
virtual ~Interface() = default;
|
||||
virtual bool init(int domainId, int exerciseId) = 0;
|
||||
virtual const char *name() const = 0;
|
||||
virtual QString echo(const QString &message) = 0;
|
||||
};
|
||||
|
||||
|
||||
} // namespace Plugin
|
||||
} // namespace CentralEffectSimulation
|
||||
|
||||
Q_DECLARE_INTERFACE(CentralEffectSimulation::Plugin::Plugin, "special:3:ces")
|
||||
Reference in new issue
Block a user