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,108 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <CoPrtCnv/tetra_telegram_ids.h>
|
||||
#include <map>
|
||||
#include <QByteArray>
|
||||
|
||||
// manual class imports
|
||||
|
||||
|
||||
namespace N_CoPrtCnv
|
||||
{
|
||||
class CoPrtCnvRadioTelegram;
|
||||
}
|
||||
|
||||
namespace PrtCnv
|
||||
{
|
||||
/**
|
||||
* Hold the data of a TNE (Client on radio-side) needed for login, licensing,
|
||||
* nachforderungs-statistic and reading fragmented telegrams from TNE.
|
||||
* @author wia
|
||||
* @version 1.0
|
||||
* @updated 16-Mrz-2010 11:20:11
|
||||
*/
|
||||
class PrtCnvMember final
|
||||
{
|
||||
public:
|
||||
|
||||
/**
|
||||
* The status of the member
|
||||
* @author wia
|
||||
* @version 1.0
|
||||
* @updated 16-Mrz-2010 11:20:11
|
||||
*/
|
||||
enum E_MemberStatus
|
||||
{
|
||||
e_Ok,
|
||||
e_AlreadyLoggedIn,
|
||||
e_MasteringLogIn,
|
||||
e_NotLoggedIn
|
||||
};
|
||||
~PrtCnvMember();
|
||||
|
||||
/**
|
||||
* Constructor with id and ISSI as parameter
|
||||
*
|
||||
* @param a_id
|
||||
* @param a_issi
|
||||
*/
|
||||
PrtCnvMember(int a_id, int a_issi);
|
||||
|
||||
/**
|
||||
* Adds a radio-telegram-fragment to this member.
|
||||
*
|
||||
* @param a_radioTelegram
|
||||
*/
|
||||
void addFragmentedTelegram(const N_CoPrtCnv::CoPrtCnvRadioTelegram &a_radioTelegram);
|
||||
/**
|
||||
* Returns the telegram-Id of the fragmented telegram assiged to this member.
|
||||
* If not evaluable: 0 will be returned.
|
||||
*/
|
||||
gef_telegramm_id_et getFragmentedTelegramId() const;
|
||||
/**
|
||||
* Erases the radio-telegram-fragments assiged to this member. The fragments
|
||||
* itself will be deleted.
|
||||
*/
|
||||
void clearFragmentedList();
|
||||
/**
|
||||
* Returns the radio-telegram-fragments assembled to a only big radio-telegram.
|
||||
* The fragments will not be deleted.
|
||||
* Returns NULL if it was impossible to assemble the telegram.
|
||||
*/
|
||||
QByteArray getUnfragmentedTelegramData() const;
|
||||
/**
|
||||
* Returns true if the fragment-list is empty
|
||||
*/
|
||||
bool isFragmentedListEmpty() const;
|
||||
|
||||
public:
|
||||
// The ISSI of this TNE (0..0xFFFFFF)
|
||||
int m_ISSI;
|
||||
// Counts the Nachforderungen asked from this TNE
|
||||
int m_ClaimCount;
|
||||
// the exercise where the member is currently logged in
|
||||
int m_loggedInExerciseId;
|
||||
// The identification (also called Ausstattungs-Nummer) of this TNE (0..10000)
|
||||
int m_Id;
|
||||
// true if TNE is licensed
|
||||
bool m_Licensed;
|
||||
|
||||
private:
|
||||
// Map of radio-telegram-fragments ordered by fragment-number
|
||||
std::multimap<uint16_t,N_CoPrtCnv::CoPrtCnvRadioTelegram*> m_FragmentedTelegramList;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user