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,92 @@
|
||||
#include <QLayout>
|
||||
|
||||
#include "content.h"
|
||||
#include "fullline.h"
|
||||
#include "ui_content.h"
|
||||
|
||||
Content::Content(QWidget *parent) : QWidget(parent)
|
||||
, m_ui(new Ui::Content)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
|
||||
Content::~Content()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
void Content::init()
|
||||
{
|
||||
delete layout();
|
||||
m_layout = new QVBoxLayout(this);
|
||||
m_layout->setSpacing(0);
|
||||
|
||||
while (!m_lines.isEmpty())
|
||||
deleteLastLine();
|
||||
|
||||
while (m_lines.size() < m_lineCount)
|
||||
newLine();
|
||||
}
|
||||
|
||||
void Content::setLineCount(int lineCount)
|
||||
{
|
||||
while(lineCount != m_lines.size())
|
||||
{
|
||||
if(lineCount > m_lineCount)
|
||||
newLine();
|
||||
else if (lineCount < m_lineCount)
|
||||
deleteLastLine();
|
||||
}
|
||||
|
||||
m_lineCount = m_lines.size();
|
||||
}
|
||||
|
||||
void Content::setCharCount(int charCount)
|
||||
{
|
||||
m_charCount = charCount;
|
||||
|
||||
for (FullLine * l : qAsConst(m_lines))
|
||||
l->setCharCount(m_charCount);
|
||||
}
|
||||
|
||||
int Content::charCount() const
|
||||
{
|
||||
return m_charCount;
|
||||
}
|
||||
|
||||
void Content::setHeight(int height)
|
||||
{
|
||||
m_height = height;
|
||||
|
||||
for (FullLine * l : qAsConst(m_lines))
|
||||
l->setHeight(height);
|
||||
}
|
||||
|
||||
int Content::height() const
|
||||
{
|
||||
return m_height;
|
||||
}
|
||||
|
||||
void Content::setCharCountAndHeight(int charCount, int height)
|
||||
{
|
||||
m_charCount = charCount;
|
||||
m_height = height;
|
||||
|
||||
init();
|
||||
}
|
||||
|
||||
void Content::newLine()
|
||||
{
|
||||
FullLine *line = new FullLine(m_lines.count()+1, m_height, m_charCount, this);
|
||||
m_layout->addWidget(line);
|
||||
m_lines.append(line);
|
||||
}
|
||||
|
||||
void Content::deleteLastLine()
|
||||
{
|
||||
if (m_lines.isEmpty())
|
||||
return;
|
||||
|
||||
delete m_lines.last();
|
||||
m_lines.remove(m_lines.size()-1);
|
||||
}
|
||||
Reference in new issue
Block a user