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,105 @@
|
||||
#pragma once
|
||||
|
||||
#include "DataModel.h"
|
||||
#include "AddModel.h"
|
||||
#include "AddLine.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QList>
|
||||
#include <QSet>
|
||||
#include <QModelIndex>
|
||||
|
||||
class QueryWorker;
|
||||
class QCheckBox;
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class Query;
|
||||
}
|
||||
|
||||
|
||||
class Query: public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Query(QueryWorker* queryWorker, QWidget *parent = nullptr);
|
||||
~Query();
|
||||
|
||||
void setTable(const QString& tableName); // get's data from specified table and shows it in the data view
|
||||
|
||||
void setModel();
|
||||
void refreshData(QVariant val, QModelIndex onThisPosition);
|
||||
void handleError(const QString &errorText);
|
||||
|
||||
private:
|
||||
Ui::Query* m_ui;
|
||||
DataModel* m_model;
|
||||
QSortFilterProxyModel m_sortModel;
|
||||
QueryWorker* m_queryWorker;
|
||||
AddLines* m_addLines; // need access to add lines for show/hide/close.....
|
||||
QSet<QCheckBox *> m_checkboxes;
|
||||
bool m_idInWhere;
|
||||
|
||||
void setCustomQuery(); // cannot add/delete/reload
|
||||
void setTableQuery(); // can add/delete/reload
|
||||
|
||||
QStringList checkedColumnsNames() const;
|
||||
signals:
|
||||
void signalShowWait(const QString &msg);
|
||||
void signalHideWait();
|
||||
|
||||
private slots:
|
||||
void slotExportCSV();
|
||||
void onQueryDelete();
|
||||
void onQueryInsert();
|
||||
void onQueryUpdate();
|
||||
|
||||
// new architecture
|
||||
|
||||
// Delete Line(s)
|
||||
signals:
|
||||
void signalDeleteLines(Query* caller, const QList<QModelIndex> &, DataModel*);
|
||||
|
||||
private slots:
|
||||
void slotDeleteLine();
|
||||
void slotDeleteLinesResult(Query* caller, int affectedRowsCount, QString errorText, const QList<QModelIndex> &affectedRowsList);
|
||||
|
||||
|
||||
// Custom Query
|
||||
signals:
|
||||
void signalCustomQuery(Query* caller, const QString &, DataModel*);
|
||||
|
||||
private slots:
|
||||
void slotCustomQuery();
|
||||
void slotCustomQueryResult(Query* caller, const QString &errorText);
|
||||
|
||||
|
||||
// Table Query
|
||||
signals:
|
||||
void signalTableQuery(Query* caller, DataModel*);
|
||||
|
||||
private slots:
|
||||
void slotTableQuery();
|
||||
void slotTableQueryResult(Query* caller, const QString &errorText);
|
||||
|
||||
|
||||
// Add Line
|
||||
signals:
|
||||
void signalAddLines(Query* caller, AddModel*);
|
||||
|
||||
private slots:
|
||||
void slotStartAddLines();
|
||||
void slotAddLines(AddModel*);
|
||||
void slotAddLinesResult(Query* caller, int affectedRows, const QString &errorText);
|
||||
|
||||
|
||||
// Set Data
|
||||
signals:
|
||||
void signalSetData(Query* caller, DataModel *model, const QModelIndex &index, const QVariant &val);
|
||||
|
||||
private slots:
|
||||
void slotSetData(DataModel* model, const QModelIndex &index, const QVariant &val);
|
||||
void slotSetDataResult(Query* caller, const QString &errorText);
|
||||
};
|
||||
Reference in new issue
Block a user