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,74 @@
|
||||
/**
|
||||
* The Service class holds information about a single service, which was read from a xxx_service.xml file.
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Baeuerle, SLSE, 2016-02-15
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <ServiceManagement/scm.hpp>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
class QProcess;
|
||||
|
||||
namespace ServiceManagement
|
||||
{
|
||||
class LicenceDonator;
|
||||
class ServiceInformation;
|
||||
class ServiceProcess;
|
||||
|
||||
class Service final : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Service(const QString &name, const QString &exe, const QString &dir, const QString &abbr, const QStringList &groups, bool isInDevMode, const int prio);
|
||||
|
||||
int id() const;
|
||||
const QString &name() const;
|
||||
const int &prio() const;
|
||||
const QString &abbreviation() const;
|
||||
const QStringList &groups() const;
|
||||
bool devMode() const;
|
||||
std::shared_ptr<LicenceDonator> licenceDonator();
|
||||
|
||||
ServiceProcess *toServiceProcess(const GroupRequest &groupData);
|
||||
ServiceProcess *procFromPid(qint64 pid);
|
||||
ServiceProcess *procFromServiceProcId(int32_t id);
|
||||
const QVector<ServiceProcess *> &allProcs() const;
|
||||
void stopAllProcs();
|
||||
void waitForStopped();
|
||||
|
||||
void setLicenceDonator(const std::shared_ptr<LicenceDonator> &licenceDonator)
|
||||
{
|
||||
m_licenceDonator = licenceDonator;
|
||||
}
|
||||
|
||||
private Q_SLOTS:
|
||||
void onServiceProcessDestroyed(QObject *obj);
|
||||
|
||||
Q_SIGNALS:
|
||||
void newServiceInfo(const ServiceInformation &info);
|
||||
|
||||
private:
|
||||
QString m_name;
|
||||
QString m_executable;
|
||||
QString m_directory;
|
||||
QString m_abbreviation;
|
||||
QStringList m_groups;
|
||||
bool m_isInDevMode;
|
||||
unsigned int m_id;
|
||||
QVector<ServiceProcess *> m_procs;
|
||||
std::shared_ptr<LicenceDonator> m_licenceDonator;
|
||||
int m_prio;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
static int32_t idCounter;
|
||||
};
|
||||
} // namespace ServiceManagement
|
||||
Reference in new issue
Block a user