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,62 @@
|
||||
#pragma once
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
|
||||
using Data = QVector<QVariant>;
|
||||
using DataList = QVector<Data>;
|
||||
using HeaderList = QVector<QPair<QString, QVariant::Type>>;
|
||||
|
||||
class DataModel: public QAbstractTableModel
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DataModel(QObject* parent = nullptr);
|
||||
|
||||
|
||||
//void fillModel(const HeaderList &headerList, const DataList &dataList);
|
||||
void dataListReserve(const int size);
|
||||
void addLine(const Data& data);
|
||||
void addColumn(const QString& columnName, QVariant::Type type);
|
||||
const HeaderList& getHeaderList() const;
|
||||
|
||||
|
||||
|
||||
void setTableName(const QString& tableName);
|
||||
QString getTableName() const;
|
||||
void setEditable(bool editable);
|
||||
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role) override;
|
||||
|
||||
|
||||
void deleteLines(const QList<QModelIndex> &affectedRowsList);
|
||||
|
||||
private:
|
||||
HeaderList m_headerList;
|
||||
DataList m_dataList;
|
||||
|
||||
// Threading...
|
||||
HeaderList m_newHeaderList;
|
||||
DataList m_newDataList;
|
||||
|
||||
|
||||
QString m_tableName;
|
||||
Qt::ItemFlags m_flags;
|
||||
|
||||
QAtomicInt m_idle;
|
||||
|
||||
void resetFlags();
|
||||
|
||||
|
||||
public slots:
|
||||
void slotSwapLists();
|
||||
void slotSetData(const QModelIndex &index, const QVariant &value);
|
||||
|
||||
signals:
|
||||
void signalSetData(DataModel*, const QModelIndex &, const QVariant &);
|
||||
};
|
||||
Reference in new issue
Block a user