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,65 @@
|
||||
/**
|
||||
* NomNotification object
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hanna E. Rathje, ESZS, 2025-06-23
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "dds_handler.h"
|
||||
//#include "nom_db.h"
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
|
||||
// Generated
|
||||
#include <NotificationManagement/nom_db.h>
|
||||
|
||||
namespace NotificationManagement
|
||||
{
|
||||
|
||||
class ObjectNotification final
|
||||
{
|
||||
public:
|
||||
explicit ObjectNotification(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
const std::shared_ptr<DatabaseInterface> &db);
|
||||
|
||||
~ObjectNotification();
|
||||
|
||||
Core::FunctionReplyObject createObject(const NomNotification &data);
|
||||
Core::FunctionReplyObject readReceipt(const ReadReceipt &data, int notificationId);
|
||||
Core::FunctionReplyObject deleteMessage(const DeleteMessage &data, int notificationId);
|
||||
Core::FunctionReplyObject deleteObject(const DeleteMessage &data, int notificationId);
|
||||
Core::FunctionReplyObject removeObject();
|
||||
|
||||
Core::FunctionReplyObject setUsed(bool isUsed);
|
||||
|
||||
qint32 id() const { return m_dataNotificationObject.id(); }
|
||||
NomNotification notification() const { return m_dataNotificationObject; }
|
||||
QString title() const { return QString::fromStdString(m_dataNotificationObject.title()); }
|
||||
|
||||
bool isValid() const;
|
||||
bool isUsed() const;
|
||||
|
||||
|
||||
// convert methods
|
||||
Database::NomNotification toDbData(const NomNotification &ddsData); // dds -> db
|
||||
static NomNotification toDdsData(const Database::NomNotification &dbData); // db -> dds
|
||||
|
||||
static Database::NomAddress toDbData(const Address &ddsData); // dds -> db
|
||||
static Address toDdsData(const Database::NomAddress &dbData); // db -> dds
|
||||
|
||||
private:
|
||||
void onPublishData();
|
||||
QString contentArgsToJson();
|
||||
static std::vector<std::string> jsonToContentArgs(const QString &properties);
|
||||
|
||||
private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<DatabaseInterface> m_db;
|
||||
NomNotification m_dataNotificationObject;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
} // namespace NotificationManagement
|
||||
Reference in new issue
Block a user