Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -287,6 +287,9 @@ protected:
return -1;
}
// Protected accessor for derived/proxy models
const QVector<T>& getDataVector() const { return m_vecData; }
QVector<T> m_vecData;
QVector<QString> m_vecColumns;
};
@@ -10,7 +10,7 @@
#pragma once
#include <QtWidgets/QWidget>
#include <QDoubleSpinBox>
#include <QtWidgets/QDoubleSpinBox>
#include <QtCore/QSet>
#include <LtsWidgets/lts_widgets_export.h>
@@ -63,7 +63,8 @@ void LtsColumnFilterProxyModel::setColumnStringFilter(const QString &newFilterSt
it.value() = rx;
}
}
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterData, int column)
@@ -90,7 +91,8 @@ void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterDat
it.value() = newFilterData;
}
}
invalidateFilter();
beginFilterChange();
endFilterChange();
}
@@ -138,7 +140,8 @@ void LtsColumnFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
if (m_bRecursiveFiltering == recursive)
return;
m_bRecursiveFiltering = recursive;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
bool LtsColumnFilterProxyModel::recursiveFilteringEnabled() const
@@ -20,14 +20,14 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>
#include <QCompleter>
#include <QtWidgets/QCompleter>
#include <QtCore/QDateTime>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
#include <QtGui/QKeyEvent>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
#include <QRegularExpressionValidator>
#include <QtGui/QRegularExpressionValidator>
#include <QtGui/QShortcut>
#include <QtWidgets/QSlider>
#include <QtWidgets/QToolButton>
@@ -20,14 +20,14 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>
#include <QCompleter>
#include <QtWidgets/QCompleter>
#include <QtCore/QDateTime>
#include <QtWidgets/QGridLayout>
#include <QtWidgets/QHBoxLayout>
#include <QtGui/QKeyEvent>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QPushButton>
#include <QRegularExpressionValidator>
#include <QtGui/QRegularExpressionValidator>
#include <QtGui/QShortcut>
#include <QtWidgets/QSlider>
#include <QtWidgets/QToolButton>
@@ -10,9 +10,9 @@
#include "lts_height_plot_widget.h"
#include <QtGui/QPainter>
#include <QPainterPath>
#include <QtGui/QPainterPath>
#include <QtGui/QPen>
#include <QTransform>
#include <QtGui/QTransform>
#include <QtGui/QMouseEvent>
#include <cmath>
@@ -2,7 +2,7 @@
#include "lts_widgets_export.h"
#include <QtWidgets/QWidget>
#include <QPainterPath>
#include <QtGui/QPainterPath>
class QPaintEvent;
@@ -11,7 +11,7 @@
#include "lts_profile_button.h"
#include <QtGui/QPainter>
#include <QPainterPath>
#include <QtGui/QPainterPath>
#include <QtGui/QPaintEvent>
#include <QtGui/QBrush>
#include <QtGui/QPen>
@@ -223,14 +223,14 @@ void LtsTextEditor2::setupFileActions()
const QIcon exportPdfIcon = QIcon::fromTheme(QStringLiteral("exportpdf"), QIcon(rsrcPath()+ QStringLiteral("/exportpdf.png")));
actionExport = menu->addAction(exportPdfIcon, tr("&Export PDF..."), this, &LtsTextEditor2::filePrintPdf);
actionExport->setPriority(QAction::LowPriority);
actionExport->setShortcut(Qt::CTRL + Qt::Key_D);
actionExport->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_D));
tb->addAction(actionExport);
menu->addSeparator();
#endif
m_actionQuit = menu->addAction(tr("&Quit"), this, &QWidget::close);
m_actionQuit->setShortcut(Qt::CTRL + Qt::Key_Q);
m_actionQuit->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_Q));
}
void LtsTextEditor2::setupEditActions()
@@ -281,7 +281,7 @@ void LtsTextEditor2::setupTextActions()
const QIcon boldIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-text-bold.png"));
m_actionTextBold = menu->addAction(boldIcon, tr("&Bold"), this, &LtsTextEditor2::onTextBold);
m_actionTextBold->setShortcut(Qt::CTRL + Qt::Key_B);
m_actionTextBold->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_B));
m_actionTextBold->setPriority(QAction::LowPriority);
QFont bold;
bold.setBold(true);
@@ -292,7 +292,7 @@ void LtsTextEditor2::setupTextActions()
const QIcon italicIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-text-italic.png"));
m_actionTextItalic = menu->addAction(italicIcon, tr("&Italic"), this, &LtsTextEditor2::onTextItalic);
m_actionTextItalic->setPriority(QAction::LowPriority);
m_actionTextItalic->setShortcut(Qt::CTRL + Qt::Key_I);
m_actionTextItalic->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_I));
QFont italic;
italic.setItalic(true);
m_actionTextItalic->setFont(italic);
@@ -301,7 +301,7 @@ void LtsTextEditor2::setupTextActions()
const QIcon underlineIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-text-underline.png"));
m_actionTextUnderline = menu->addAction(underlineIcon, tr("&Underline"), this, &LtsTextEditor2::onTextUnderline);
m_actionTextUnderline->setShortcut(Qt::CTRL + Qt::Key_U);
m_actionTextUnderline->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_U));
m_actionTextUnderline->setPriority(QAction::LowPriority);
QFont underline;
underline.setUnderline(true);
@@ -313,31 +313,31 @@ void LtsTextEditor2::setupTextActions()
const QIcon leftIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-left.png"));
m_actionAlignLeft = new QAction(leftIcon, tr("&Left"), this);
m_actionAlignLeft->setShortcut(Qt::CTRL + Qt::Key_L);
m_actionAlignLeft->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_L));
m_actionAlignLeft->setCheckable(true);
m_actionAlignLeft->setPriority(QAction::LowPriority);
const QIcon centerIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-center.png"));
m_actionAlignCenter = new QAction(centerIcon, tr("C&enter"), this);
m_actionAlignCenter->setShortcut(Qt::CTRL + Qt::Key_E);
m_actionAlignCenter->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_E));
m_actionAlignCenter->setCheckable(true);
m_actionAlignCenter->setPriority(QAction::LowPriority);
const QIcon rightIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-right.png"));
m_actionAlignRight = new QAction(rightIcon, tr("&Right"), this);
m_actionAlignRight->setShortcut(Qt::CTRL + Qt::Key_R);
m_actionAlignRight->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_R));
m_actionAlignRight->setCheckable(true);
m_actionAlignRight->setPriority(QAction::LowPriority);
const QIcon fillIcon = QIcon::fromTheme(QStringLiteral(":icons/22x22/format-justify-fill.png"));
m_actionAlignJustify = new QAction(fillIcon, tr("&Justify"), this);
m_actionAlignJustify->setShortcut(Qt::CTRL + Qt::Key_J);
m_actionAlignJustify->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_J));
m_actionAlignJustify->setCheckable(true);
m_actionAlignJustify->setPriority(QAction::LowPriority);
const QIcon indentMoreIcon = QIcon::fromTheme(QStringLiteral("format-indent-more"), QIcon(rsrcPath()+ QStringLiteral("/format-indent-more.png")));
m_actionIndentMore = menu->addAction(indentMoreIcon, tr("&Indent"), this, &LtsTextEditor2::indent);
m_actionIndentMore->setShortcut(Qt::CTRL + Qt::Key_BracketRight);
m_actionIndentMore->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_BracketRight));
m_actionIndentMore->setPriority(QAction::LowPriority);
const QIcon indentLessIcon = QIcon::fromTheme(QStringLiteral("format-indent-less"), QIcon(rsrcPath()+ QStringLiteral("/format-indent-less.png")));
m_actionIndentLess = menu->addAction(indentLessIcon, tr("&Unindent"), this, &LtsTextEditor2::unindent);
m_actionIndentLess->setShortcut(Qt::CTRL + Qt::Key_BracketLeft);
m_actionIndentLess->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_BracketLeft));
m_actionIndentLess->setPriority(QAction::LowPriority);
// Make sure the alignLeft is always left of the alignRight
@@ -381,7 +381,7 @@ void LtsTextEditor2::setupTextActions()
const QIcon checkboxIcon = QIcon::fromTheme(QStringLiteral("status-checkbox-checked"), QIcon(rsrcPath()+ QStringLiteral("/checkbox-checked.png")));
m_actionToggleCheckState = menu->addAction(checkboxIcon, tr("Chec&ked"), this, &LtsTextEditor2::setChecked);
m_actionToggleCheckState->setShortcut(Qt::CTRL + Qt::Key_K);
m_actionToggleCheckState->setShortcut(QKeyCombination(Qt::CTRL, Qt::Key_K));
m_actionToggleCheckState->setCheckable(true);
m_actionToggleCheckState->setPriority(QAction::LowPriority);
tb->addAction(m_actionToggleCheckState);