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,156 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* SymbolProperties
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
// Own
|
||||
#include "symbol_properties.h"
|
||||
#include <SymbologyImpl/advanced_symbology_logging.h> // to get operator<< (std::ostream& stream, const QString& string_ref)
|
||||
|
||||
|
||||
// ESRI
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QStringRef>
|
||||
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
QString SymbolProperties::key() const
|
||||
{
|
||||
return m_key;
|
||||
}
|
||||
|
||||
void SymbolProperties::setKey(const QString &key)
|
||||
{
|
||||
m_key = key;
|
||||
}
|
||||
|
||||
QString SymbolProperties::name() const
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
|
||||
void SymbolProperties::setName(const QString &name)
|
||||
{
|
||||
m_name = name;
|
||||
}
|
||||
|
||||
QString SymbolProperties::category() const
|
||||
{
|
||||
return m_category;
|
||||
}
|
||||
|
||||
void SymbolProperties::setCategory(const QString &category)
|
||||
{
|
||||
m_category = category;
|
||||
}
|
||||
|
||||
QString SymbolProperties::symbolClass() const
|
||||
{
|
||||
return m_symbolClass;
|
||||
}
|
||||
|
||||
void SymbolProperties::setSymbolClass(const QString &symbolClass)
|
||||
{
|
||||
m_symbolClass = symbolClass;
|
||||
}
|
||||
|
||||
QStringList SymbolProperties::tags() const
|
||||
{
|
||||
return m_tags;
|
||||
}
|
||||
|
||||
QString SymbolProperties::gctString() const
|
||||
{
|
||||
for (const QString &tag : m_tags)
|
||||
{
|
||||
if (tag.startsWith(QLatin1String("gct_")))
|
||||
return tag;
|
||||
} // foreach
|
||||
return QString();
|
||||
}
|
||||
|
||||
void SymbolProperties::setTags(const QStringList &tags)
|
||||
{
|
||||
m_tags = tags;
|
||||
}
|
||||
|
||||
GeometryType SymbolProperties::geometryType() const
|
||||
{
|
||||
return m_geometryType;
|
||||
}
|
||||
|
||||
void SymbolProperties::setGeometryType(const GeometryType &geometryType)
|
||||
{
|
||||
m_geometryType = geometryType;
|
||||
}
|
||||
|
||||
|
||||
QString SymbolProperties::sidc() const
|
||||
{
|
||||
return m_sidc;
|
||||
}
|
||||
|
||||
|
||||
void SymbolProperties::setSidc(const QString &sidc)
|
||||
{
|
||||
m_sidc = sidc;
|
||||
}
|
||||
|
||||
|
||||
QString SymbolProperties::originalKey() const
|
||||
{
|
||||
return m_originalKey;
|
||||
}
|
||||
|
||||
void SymbolProperties::setOriginalKey(const QString &originalKey)
|
||||
{
|
||||
m_originalKey = originalKey;
|
||||
}
|
||||
|
||||
|
||||
QString SymbolProperties::key_SymbolSet() const
|
||||
{
|
||||
if (m_key.count() < 8)
|
||||
return QString();
|
||||
return QStringRef(&m_key, 0, 2).toString();
|
||||
}
|
||||
QString SymbolProperties::key_Entity() const
|
||||
{
|
||||
if (m_key.count() < 8)
|
||||
return QString();
|
||||
return QStringRef(&m_key, 2, 6).toString();
|
||||
}
|
||||
|
||||
QString SymbolProperties::key_SymbolSetEntity() const
|
||||
{
|
||||
if (m_key.count() < 8)
|
||||
return QString();
|
||||
|
||||
return key_SymbolSet() + key_Entity();
|
||||
}
|
||||
|
||||
|
||||
QColor SymbolProperties::colorToBeReplaced() const
|
||||
{
|
||||
return m_colorToBeReplaced;
|
||||
}
|
||||
void SymbolProperties::setColorToBeReplaced(const QColor &colorToBeReplaced)
|
||||
{
|
||||
m_colorToBeReplaced = colorToBeReplaced;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
} // namespace AdvancedSymbology
|
||||
|
||||
|
||||
Reference in new issue
Block a user