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,105 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
#include "LogViewXdrStruct.hpp"
|
||||
#include "LogViewXdrValue.hpp"
|
||||
#include "LogViewXdrType.hpp"
|
||||
|
||||
namespace N_LogView
|
||||
{
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrStruct::LogViewXdrStruct(const QString& a_name, const LogViewXdrElement::E_ElementKind a_kind, uint16_t enumSize)
|
||||
: LogViewXdrElement(a_name, a_kind, "LogViewXdrStruct")
|
||||
, m_EnumSize(enumSize)
|
||||
{
|
||||
}
|
||||
|
||||
LogViewXdrStruct::~LogViewXdrStruct()
|
||||
{
|
||||
for (auto ptr : m_ChildList)
|
||||
delete ptr;
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewXdrStruct::addElement(const QString& a_name, const QString& a_type, const uint16_t a_arraySize, const uint16_t a_dynArrayOffset, const E_ElementKind a_kind, const int16_t a_firstBit, const int16_t a_lastBit, const bool a_isLast)
|
||||
{
|
||||
m_ChildList.push_back(new LogViewXdrType(a_name, a_type, a_arraySize, a_dynArrayOffset, a_kind, a_firstBit, a_lastBit, a_isLast));
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewXdrStruct::addElement(const QString& a_name, const uint32_t a_value, const E_ElementKind a_kind)
|
||||
{
|
||||
m_ChildList.push_back(new LogViewXdrValue(a_name, a_value, a_kind));
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrElement* LogViewXdrStruct::getChild(const uint32_t a_childIndex) const
|
||||
{
|
||||
if (m_ChildList.size() > a_childIndex)
|
||||
return m_ChildList[a_childIndex];
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrType* LogViewXdrStruct::getChildAsType(const uint32_t a_childIndex) const
|
||||
{
|
||||
return static_cast<LogViewXdrType*>(getChild(a_childIndex)); // fixme: check ob es wirklich ein XdrType ist
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
LogViewXdrValue* LogViewXdrStruct::getChildAsValue(const uint32_t a_childIndex) const
|
||||
{
|
||||
return static_cast<LogViewXdrValue*>(getChild(a_childIndex)); // fixme: check ob es wirklich ein XdrValue ist
|
||||
}
|
||||
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
void LogViewXdrStruct::dump() const
|
||||
{
|
||||
INFO_LOG(m_logger) << "Element[" << getName().toStdString() << "]: kind=" << getKindName().toStdString() << " enumSize=" << getEnumSize();
|
||||
INFO_LOG(m_logger) << "-------------- childs start -----------------";
|
||||
|
||||
std::vector<LogViewXdrElement*>::const_iterator iter = m_ChildList.begin();
|
||||
while (iter != m_ChildList.end())
|
||||
{
|
||||
(*iter)->dump();
|
||||
++iter;
|
||||
}
|
||||
INFO_LOG(m_logger) << "-------------- childs end -----------------";
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------
|
||||
uint32_t LogViewXdrStruct::getChildValue(const QString& a_name, bool* a_error) const
|
||||
{
|
||||
if (a_error)
|
||||
*a_error = false;
|
||||
std::vector<LogViewXdrElement*>::const_iterator iter = m_ChildList.begin();
|
||||
while (iter != m_ChildList.end())
|
||||
{
|
||||
if ((*iter)->getName() == a_name)
|
||||
return static_cast<const LogViewXdrValue*>(*iter)->getValue();
|
||||
++iter;
|
||||
}
|
||||
if (a_error)
|
||||
*a_error = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace N_LogView
|
||||
|
||||
Reference in new issue
Block a user