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,85 @@
|
||||
/**
|
||||
* The Group class represents a group which was already startet.
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Baeuerle, SLSE, 2016-02-15
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtCore/QElapsedTimer>
|
||||
|
||||
#include <DDS/Core/core_enums.hpp>
|
||||
|
||||
#include "logger.h"
|
||||
#include "dds_handler.h"
|
||||
#include "service_process.h"
|
||||
|
||||
class QTimer;
|
||||
|
||||
namespace ServiceManagement
|
||||
{
|
||||
struct GroupScheme;
|
||||
|
||||
class GroupInformation;
|
||||
class ServiceDonator;
|
||||
class ServiceInformation;
|
||||
|
||||
class Group final : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
Group(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<ServiceDonator> &serviceDonator,
|
||||
const GroupRequest &groupData,
|
||||
GroupScheme *scheme,
|
||||
QObject *parent);
|
||||
~Group();
|
||||
|
||||
bool setRunningState(Core::RunningState newState);
|
||||
|
||||
void startCore();
|
||||
void start();
|
||||
void stop();
|
||||
void restart();
|
||||
|
||||
void takeServicesFromGroup(Group *otherGroup);
|
||||
|
||||
bool allProcsStopped() const;
|
||||
Core::ServiceGroupType type() const;
|
||||
int32_t domainId() const { return m_groupData.domainId(); }
|
||||
int32_t exercisePartitionId() const { return m_groupData.exercisePartitionId(); }
|
||||
int32_t replayPartitionId() const { return m_groupData.replayPartitionId(); }
|
||||
int32_t id() const { return m_groupId; }
|
||||
qint64 lastHeartbeatMSec() const;
|
||||
|
||||
QMap<int, ServiceProcess *> serviceProcs() const;
|
||||
|
||||
private Q_SLOTS:
|
||||
void onNewServiceInfo();
|
||||
void onCompleteCoreTick();
|
||||
|
||||
private: // methods
|
||||
void init();
|
||||
ServiceProcess *procFromPid(Q_PID pid);
|
||||
|
||||
private: // attributes
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<ServiceDonator> m_serviceDonator;
|
||||
GroupScheme *m_scheme;
|
||||
int32_t m_groupId;
|
||||
GroupRequest m_groupData;
|
||||
QMap<int, ServiceProcess *> m_serviceProcs;
|
||||
qint64 m_completeCoreTimeout;
|
||||
QElapsedTimer m_elapsedTimer;
|
||||
int m_actPrio = 1;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
static int32_t s_idCounter;
|
||||
int getNextPrio(QList<int> &prioList);
|
||||
};
|
||||
} // namespace ServiceManagement
|
||||
Reference in new issue
Block a user