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,180 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Template for 'real' structures including insert/update/delete functions for db
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
|
||||
// filename: tab_db_impl.h
|
||||
#pragma once
|
||||
|
||||
#include <QPointF>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QSqlDriver>
|
||||
#include <QSqlDatabase>
|
||||
#include <QtSql/QSqlError>
|
||||
|
||||
#include <TrainingAreaBase/tab_enums.hpp>
|
||||
#include <TrainingAreaBase/tab_db.h>
|
||||
#include <TrainingAreaBase/logger.h>
|
||||
|
||||
class NSqlQuery;
|
||||
namespace TrainingAreaBase
|
||||
{
|
||||
class TAB_COMMON_EXPORT DatabaseInterfaceImpl final : public DatabaseInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit DatabaseInterfaceImpl(int exerciseId);
|
||||
~DatabaseInterfaceImpl();
|
||||
|
||||
bool init(const QSqlDatabase &dbConnection) override final;
|
||||
bool init(const QString &dbUser,
|
||||
const QString &dbPasswd,
|
||||
const QString &dbDriver,
|
||||
const QString &dbHost,
|
||||
const QString &dbName) override final;
|
||||
|
||||
QString schemaName() const override final;
|
||||
QString dbUser() const override final;
|
||||
const QSqlDatabase &database() const override final { return m_dbConnection; }
|
||||
void setEmitMessageOnError(bool bEmit) override final;
|
||||
QSqlError getLastError() const override final;
|
||||
|
||||
|
||||
|
||||
// Database::AesId2TaId
|
||||
bool insert(Database::AesId2TaId &data) override final;
|
||||
bool upsert(Database::AesId2TaId &data) override final;
|
||||
bool update(const Database::AesId2TaId &data) override final;
|
||||
|
||||
bool insert(std::vector<Database::AesId2TaId> &cont) override final;
|
||||
bool upsert(std::vector<Database::AesId2TaId> &cont) override final;
|
||||
bool update(const std::vector<Database::AesId2TaId> &cont) override final;
|
||||
|
||||
bool select(QVector<Database::AesId2TaId> &dataVec) override final;
|
||||
bool select(const std::function<void(const Database::AesId2TaId &data)> &cb) override final;
|
||||
bool selectByExerciseId(QVector<Database::AesId2TaId> &dataVec, const qint32 &exerciseId, const QString &orderBy = QString()) override final;
|
||||
bool selectByExerciseId(const std::function<void(const Database::AesId2TaId &data)> &cb, const qint32 &exerciseId, const QString &orderBy = QString()) override final;
|
||||
protected:
|
||||
bool selectPrepareInternalAesId2TaId(const QString &where);
|
||||
bool selectFetchInternalAesId2TaId(const std::function<void(const Database::AesId2TaId &data)> &cb);
|
||||
public:
|
||||
bool selectAesId2TaId(qint32 aesTetraId, Database::AesId2TaId &data) override final;
|
||||
bool removeAesId2TaId(qint32 aesTetraId) override final;
|
||||
bool removeAesId2TaIdByExerciseId(const qint32 &exerciseId) override final;
|
||||
bool fixUpSequenceAesId2TaId() override final;
|
||||
bool truncateAesId2TaId() override final;
|
||||
// Database::AesId2TaId
|
||||
|
||||
|
||||
// Database::PrtCnvMember
|
||||
bool insert(Database::PrtCnvMember &data) override final;
|
||||
bool upsert(Database::PrtCnvMember &data) override final;
|
||||
bool update(const Database::PrtCnvMember &data) override final;
|
||||
|
||||
bool insert(std::vector<Database::PrtCnvMember> &cont) override final;
|
||||
bool upsert(std::vector<Database::PrtCnvMember> &cont) override final;
|
||||
bool update(const std::vector<Database::PrtCnvMember> &cont) override final;
|
||||
|
||||
bool select(QVector<Database::PrtCnvMember> &dataVec) override final;
|
||||
bool select(const std::function<void(const Database::PrtCnvMember &data)> &cb) override final;
|
||||
protected:
|
||||
bool selectPrepareInternalPrtCnvMember(const QString &where);
|
||||
bool selectFetchInternalPrtCnvMember(const std::function<void(const Database::PrtCnvMember &data)> &cb);
|
||||
public:
|
||||
bool selectPrtCnvMember(qint32 id, Database::PrtCnvMember &data) override final;
|
||||
bool removePrtCnvMember(qint32 id) override final;
|
||||
bool fixUpSequencePrtCnvMember() override final;
|
||||
bool truncatePrtCnvMember() override final;
|
||||
// Database::PrtCnvMember
|
||||
|
||||
|
||||
// Database::PrtCnvStatus
|
||||
bool insert(Database::PrtCnvStatus &data) override final;
|
||||
bool upsert(Database::PrtCnvStatus &data) override final;
|
||||
bool update(const Database::PrtCnvStatus &data) override final;
|
||||
|
||||
bool insert(std::vector<Database::PrtCnvStatus> &cont) override final;
|
||||
bool upsert(std::vector<Database::PrtCnvStatus> &cont) override final;
|
||||
bool update(const std::vector<Database::PrtCnvStatus> &cont) override final;
|
||||
|
||||
bool select(QVector<Database::PrtCnvStatus> &dataVec) override final;
|
||||
bool select(const std::function<void(const Database::PrtCnvStatus &data)> &cb) override final;
|
||||
protected:
|
||||
bool selectPrepareInternalPrtCnvStatus(const QString &where);
|
||||
bool selectFetchInternalPrtCnvStatus(const std::function<void(const Database::PrtCnvStatus &data)> &cb);
|
||||
public:
|
||||
bool selectPrtCnvStatus(qint32 id, Database::PrtCnvStatus &data) override final;
|
||||
bool removePrtCnvStatus(qint32 id) override final;
|
||||
bool fixUpSequencePrtCnvStatus() override final;
|
||||
bool truncatePrtCnvStatus() override final;
|
||||
// Database::PrtCnvStatus
|
||||
|
||||
|
||||
// Database::PrtCnvToCentral
|
||||
bool insert(Database::PrtCnvToCentral &data) override final;
|
||||
bool upsert(Database::PrtCnvToCentral &data) override final;
|
||||
bool update(const Database::PrtCnvToCentral &data) override final;
|
||||
|
||||
bool insert(std::vector<Database::PrtCnvToCentral> &cont) override final;
|
||||
bool upsert(std::vector<Database::PrtCnvToCentral> &cont) override final;
|
||||
bool update(const std::vector<Database::PrtCnvToCentral> &cont) override final;
|
||||
|
||||
bool select(QVector<Database::PrtCnvToCentral> &dataVec) override final;
|
||||
bool select(const std::function<void(const Database::PrtCnvToCentral &data)> &cb) override final;
|
||||
protected:
|
||||
bool selectPrepareInternalPrtCnvToCentral(const QString &where);
|
||||
bool selectFetchInternalPrtCnvToCentral(const std::function<void(const Database::PrtCnvToCentral &data)> &cb);
|
||||
public:
|
||||
bool selectPrtCnvToCentral(qint32 id, Database::PrtCnvToCentral &data) override final;
|
||||
bool removePrtCnvToCentral(qint32 id) override final;
|
||||
bool fixUpSequencePrtCnvToCentral() override final;
|
||||
bool truncatePrtCnvToCentral() override final;
|
||||
// Database::PrtCnvToCentral
|
||||
|
||||
|
||||
// Database::PrtCnvToRadio
|
||||
bool insert(Database::PrtCnvToRadio &data) override final;
|
||||
bool upsert(Database::PrtCnvToRadio &data) override final;
|
||||
bool update(const Database::PrtCnvToRadio &data) override final;
|
||||
|
||||
bool insert(std::vector<Database::PrtCnvToRadio> &cont) override final;
|
||||
bool upsert(std::vector<Database::PrtCnvToRadio> &cont) override final;
|
||||
bool update(const std::vector<Database::PrtCnvToRadio> &cont) override final;
|
||||
|
||||
bool select(QVector<Database::PrtCnvToRadio> &dataVec) override final;
|
||||
bool select(const std::function<void(const Database::PrtCnvToRadio &data)> &cb) override final;
|
||||
protected:
|
||||
bool selectPrepareInternalPrtCnvToRadio(const QString &where);
|
||||
bool selectFetchInternalPrtCnvToRadio(const std::function<void(const Database::PrtCnvToRadio &data)> &cb);
|
||||
public:
|
||||
bool selectPrtCnvToRadio(qint32 id, Database::PrtCnvToRadio &data) override final;
|
||||
bool removePrtCnvToRadio(qint32 id) override final;
|
||||
bool fixUpSequencePrtCnvToRadio() override final;
|
||||
bool truncatePrtCnvToRadio() override final;
|
||||
// Database::PrtCnvToRadio
|
||||
|
||||
|
||||
|
||||
|
||||
protected:
|
||||
QString getTableName(const QString &tableName) const;
|
||||
|
||||
protected:
|
||||
QSqlDatabase m_dbConnection;
|
||||
std::unique_ptr<NSqlQuery> m_query;
|
||||
QSqlError m_lastError;
|
||||
int m_exerciseId;
|
||||
bool m_bEmitMessageOnError;
|
||||
bool m_bCanHandleSchemas;
|
||||
bool m_ownDatabaseConnection;
|
||||
LOGGER_T m_logger;
|
||||
private:
|
||||
bool initInternal();
|
||||
};// class DatabaseInterfaceImpl
|
||||
} // namespace TrainingAreaBase
|
||||
|
||||
Reference in new issue
Block a user