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

@@ -990,7 +990,8 @@ QSet<QString> BaseSymbolProxyModel::validBaseSymbolCodes() const
void BaseSymbolProxyModel::setValidBaseSymbolCodes(const QSet<QString> &validBaseSymbolCodes)
{
m_validBaseSymbolCodes = validBaseSymbolCodes;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void BaseSymbolProxyModel::onFilterPoints(bool on)
@@ -999,7 +1000,8 @@ void BaseSymbolProxyModel::onFilterPoints(bool on)
m_geometrySet.insert(AdvancedSymbology::GeometryType::Point);
else
m_geometrySet.remove(AdvancedSymbology::GeometryType::Point);
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void BaseSymbolProxyModel::onFilterLines(bool on)
{
@@ -1007,7 +1009,8 @@ void BaseSymbolProxyModel::onFilterLines(bool on)
m_geometrySet.insert(AdvancedSymbology::GeometryType::Polyline);
else
m_geometrySet.remove(AdvancedSymbology::GeometryType::Polyline);
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void BaseSymbolProxyModel::onFilterAreas(bool on)
{
@@ -1015,7 +1018,8 @@ void BaseSymbolProxyModel::onFilterAreas(bool on)
m_geometrySet.insert(AdvancedSymbology::GeometryType::Polygon);
else
m_geometrySet.remove(AdvancedSymbology::GeometryType::Polygon);
invalidateFilter();
beginFilterChange();
endFilterChange();
}
bool BaseSymbolProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
@@ -17,7 +17,7 @@
#include <QtCore/QList>
#include <QtCore/QPointF>
#include <QTransform>
#include <QtGui/QTransform>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace SymbologyXML
@@ -23,7 +23,7 @@
#include <QtWidgets/QGraphicsScene>
#include <QtCore/QMetaType>
#include <QtGui/QPainter>
#include <QPainterPath>
#include <QtGui/QPainterPath>
#include <QtGui/QPen>
#include <cmath>
@@ -13,7 +13,7 @@
#include "symbology_xml_export.h"
#include "primitive.h"
#include <QPainterPath>
#include <QtGui/QPainterPath>
#include <QtCore/QMap>
class QGraphicsItem;
@@ -1050,7 +1050,7 @@ QColor SymbolReader::getAttribColor(const QColor &def) {
QColor result = def;
QStringView _attrib = attributes().value(QStringLiteral("color"));
if ( _attrib.length() == 9 ) {
result.setNamedColor(_attrib.left(7).toString());
result = QColor::fromString(_attrib.left(7).toString());
// Get Alpha-Channel
bool ok;
int value = _attrib.right(2).toInt(&ok,16);