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,93 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* DBUpdate - Exercises updates model
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Iuliana Ojog, 2021-02-17
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QSqlDatabase>
|
||||
|
||||
namespace DBUpdate
|
||||
{
|
||||
struct ExerciseUpdate
|
||||
{
|
||||
qint32 id = 0;
|
||||
QString name;
|
||||
qint64 startTime = 0;
|
||||
qint64 endTime = 0;
|
||||
qint32 stateId = 0;
|
||||
QString schema;
|
||||
QString version = QStringLiteral("0.000");
|
||||
QString description = QStringLiteral("no available information");
|
||||
qint64 updated = 0;
|
||||
bool isChecked = false;
|
||||
};
|
||||
|
||||
class ExercisesModel : public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
enum Columns
|
||||
{
|
||||
Id = 0,
|
||||
Schema,
|
||||
Name,
|
||||
StartTime,
|
||||
EndTime,
|
||||
StateId,
|
||||
Version,
|
||||
Description,
|
||||
Updated
|
||||
};
|
||||
|
||||
explicit ExercisesModel(QObject *parent = nullptr);
|
||||
~ExercisesModel();
|
||||
|
||||
bool initModel(const QSqlDatabase &db, const QString &version = QStringLiteral("0.00"), const QStringList &schemas = {});
|
||||
|
||||
QVariant data(const QModelIndex &, int) const override final;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override final;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role) override final;
|
||||
|
||||
int rowCount(const QModelIndex &parent) const override final;
|
||||
int columnCount(const QModelIndex &parent) const override final;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role) const override final;
|
||||
ExerciseUpdate getRowData(int row) const;
|
||||
bool insertRow(const ExerciseUpdate &item);
|
||||
|
||||
QString toString(int stateId) const;
|
||||
|
||||
QStringList getSchemasToUpdate();
|
||||
const QString getLastUpdate() { return m_lastUpdate; }
|
||||
|
||||
friend class ExercisesProxyModel;
|
||||
protected:
|
||||
|
||||
private:
|
||||
QString m_lastUpdate = QStringLiteral("0.00");
|
||||
QVector<ExerciseUpdate> m_vecData;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class ExercisesProxyModel final : public QSortFilterProxyModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
using QSortFilterProxyModel::QSortFilterProxyModel;
|
||||
void setSourceModel(QAbstractItemModel *sourceModel) override;
|
||||
protected:
|
||||
bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
|
||||
private:
|
||||
ExercisesModel *m_sourceModel = nullptr;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user