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,91 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Base for ExerciseState
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QState>
|
||||
|
||||
#include <ExerciseManagement/exm_enums.hpp>
|
||||
|
||||
#include "object_exercise.h"
|
||||
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
|
||||
class ExerciseStateBase : public QState
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
ExerciseManagement::ExerciseState exerciseState() const { return m_exerciseState; }
|
||||
|
||||
protected:
|
||||
ExerciseStateBase(const QString &objectName, const ExerciseState &exerciseState, ObjectExercise* objExe);
|
||||
void onEntry(QEvent *event);
|
||||
|
||||
int exerciseId() const { return m_exercise ? m_exercise->id() : -1; }
|
||||
|
||||
protected:
|
||||
ObjectExercise *m_exercise;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
private:
|
||||
const ExerciseManagement::ExerciseState m_exerciseState;
|
||||
};
|
||||
|
||||
class Unknown : public ExerciseStateBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Unknown(ObjectExercise *objExe);
|
||||
};
|
||||
|
||||
class Creation : public ExerciseStateBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Creation(ObjectExercise *objExe);
|
||||
protected:
|
||||
void onEntry(QEvent *event);
|
||||
};
|
||||
|
||||
class Start : public ExerciseStateBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Start(ObjectExercise *objExe);
|
||||
protected:
|
||||
void onEntry(QEvent *event);
|
||||
void onExit(QEvent *event);
|
||||
};
|
||||
|
||||
class Pause : public ExerciseStateBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Pause(ObjectExercise *objExe);
|
||||
};
|
||||
|
||||
class Stop : public ExerciseStateBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Stop(ObjectExercise *objExe);
|
||||
protected:
|
||||
void onEntry(QEvent *event);
|
||||
};
|
||||
|
||||
class Terminate : public ExerciseStateBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Terminate(ObjectExercise *objExe);
|
||||
};
|
||||
|
||||
|
||||
} // namespace ExerciseManagement
|
||||
|
||||
Reference in new issue
Block a user