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,129 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Class PropertyResult
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
// Own
|
||||
#include "property_result.h"
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QUuid>
|
||||
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
class PropertyResult::Private
|
||||
{
|
||||
public:
|
||||
Private() = default;
|
||||
~Private() = default;
|
||||
|
||||
// Input data:
|
||||
|
||||
// process data:
|
||||
QUuid m_taskIdFindSymbol; // of esriDict::findSymbol
|
||||
|
||||
// Result data:
|
||||
bool m_resultReady = false;
|
||||
SymbolPropertyList m_symbolPropertyList;
|
||||
|
||||
|
||||
// For debugging:
|
||||
static unsigned long m_counter;
|
||||
};
|
||||
|
||||
unsigned long PropertyResult::Private::m_counter = 0;
|
||||
|
||||
|
||||
PropertyResult::PropertyResult()
|
||||
: QObject()
|
||||
, d(new Private)
|
||||
, m_logger(getLogger("PropertyResult"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_counter=" << d->m_counter;
|
||||
++d->m_counter;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, m_counter=" << d->m_counter;
|
||||
}
|
||||
|
||||
PropertyResult::~PropertyResult()
|
||||
{
|
||||
LOGGER_T m_logger = getLogger("PropertyResult");
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START, m_counter=" << d->m_counter;
|
||||
--d->m_counter;
|
||||
delete d;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END, m_counter=" << Private::m_counter;
|
||||
}
|
||||
|
||||
|
||||
void PropertyResult::fireResultReady()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
|
||||
// (this bool don`t has to be reset.
|
||||
// a new request will return a new instance of this class...)
|
||||
d->m_resultReady = true;
|
||||
|
||||
emit resultReadyInternal();
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
|
||||
void PropertyResult::setTaskId(const QUuid &uuid)
|
||||
{
|
||||
d->m_taskIdFindSymbol = uuid;
|
||||
}
|
||||
|
||||
const QUuid &PropertyResult::taskId() const
|
||||
{
|
||||
return d->m_taskIdFindSymbol;
|
||||
}
|
||||
|
||||
|
||||
void PropertyResult::setProperties(const SymbolPropertyList &properties)
|
||||
{
|
||||
d->m_symbolPropertyList = properties;
|
||||
}
|
||||
|
||||
|
||||
bool PropertyResult::isResultReady() const
|
||||
{
|
||||
return d->m_resultReady;
|
||||
}
|
||||
|
||||
SymbolPropertyList PropertyResult::properties() const
|
||||
{
|
||||
return d->m_symbolPropertyList;
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// PropertyResultWatcher
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
PropertyResultWatcher::PropertyResultWatcher(QObject *parent)
|
||||
: BaseClass(parent)
|
||||
, m_logger(getLogger("PropertyResultWatcher"))
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
}
|
||||
|
||||
QSharedPointer<PropertyResult> PropertyResultWatcher::propertyResult() const
|
||||
{
|
||||
return BaseClass::result();
|
||||
}
|
||||
|
||||
void PropertyResultWatcher::setPropertyResult(const QSharedPointer<PropertyResult> &propertyResult)
|
||||
{
|
||||
BaseClass::setResult(propertyResult);
|
||||
}
|
||||
|
||||
|
||||
} // namespace AdvancedSymbology
|
||||
|
||||
Reference in new issue
Block a user