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,80 @@
|
||||
#include "AddLine.h"
|
||||
|
||||
#include "ui_AddLinesUi.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
AddLines::AddLines(QWidget* parent)
|
||||
: QDialog(parent)
|
||||
, m_ui(new Ui::AddLines)
|
||||
{
|
||||
qRegisterMetaType<AddModel*>("AddModel*");
|
||||
|
||||
m_ui->setupUi(this);
|
||||
|
||||
m_ui->dataView->setModel(&addModel);
|
||||
|
||||
connect(m_ui->pbDone, &QPushButton::clicked,
|
||||
this, &AddLines::slotAddLines);
|
||||
|
||||
connect(m_ui->pbAbort, &QPushButton::clicked,
|
||||
this, &AddLines::close);
|
||||
|
||||
connect(m_ui->pbDelete, &QPushButton::clicked,
|
||||
this, &AddLines::slotDeleteLines);
|
||||
|
||||
connect(m_ui->pbClear, &QPushButton::clicked,
|
||||
this, &AddLines::slotClear);
|
||||
}
|
||||
|
||||
|
||||
AddLines::~AddLines()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
|
||||
void AddLines::slotDeleteLines()
|
||||
{
|
||||
//qWarning() << "slotDeleteLines";
|
||||
|
||||
while (m_ui->dataView->selectionModel()->selectedRows().count())
|
||||
{
|
||||
const QModelIndexList selectedRows = m_ui->dataView->selectionModel()->selectedRows();
|
||||
|
||||
if (selectedRows.at(0).row() == addModel.rowCount()-1) // do not delete empty row!
|
||||
{
|
||||
return; // In hope that the selectedRows list is sorted.....
|
||||
}
|
||||
|
||||
addModel.removeRow(selectedRows.at(0).row());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AddLines::slotClear()
|
||||
{
|
||||
//qWarning() << "slotClear";
|
||||
addModel.clear();
|
||||
}
|
||||
|
||||
|
||||
void AddLines::reject()
|
||||
{
|
||||
emit signalAddLines(nullptr);
|
||||
}
|
||||
|
||||
|
||||
void AddLines::copyDataFromModel(DataModel* dataModel)
|
||||
{
|
||||
addModel.setHeaderList(dataModel->getHeaderList());
|
||||
addModel.setTablename(dataModel->getTableName());
|
||||
}
|
||||
|
||||
|
||||
void AddLines::slotAddLines()
|
||||
{
|
||||
this->hide(); // hide until in work..
|
||||
emit signalAddLines(&addModel);
|
||||
}
|
||||
Reference in new issue
Block a user