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,93 @@
|
||||
/**
|
||||
**
|
||||
** @RDE_HEADER@
|
||||
** Implementation of Splines
|
||||
** $Id$
|
||||
** $HeadURL$
|
||||
** $Author$
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** Hardware-Environment: Intel-PC
|
||||
** Software-Environment: Windows 7, Qt 5.4. ArcGIS 10.2.5
|
||||
**
|
||||
** Language ........: C++ 11
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** Author ...........: Joerg Turla, SPD G, Tel. 3132
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
**
|
||||
** Notes .........:
|
||||
**
|
||||
** 19.06.2012, JT : Urversion for use in VIntel project
|
||||
** 12.08.2015, JT : adapted to SituationMap
|
||||
**
|
||||
** -----------------------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
/**
|
||||
\class Exception exception.h
|
||||
\brief Basisklasse for Exception-Handling
|
||||
|
||||
The class Exception defines a very simple exception handler, that will be able to return
|
||||
a string message when an exception is thrown
|
||||
*/
|
||||
|
||||
class Exception
|
||||
{
|
||||
public:
|
||||
|
||||
Exception()
|
||||
: _message(QLatin1String("Error"))
|
||||
{}
|
||||
|
||||
Exception(const Exception &) = default;
|
||||
|
||||
explicit Exception(const QString &msg)
|
||||
: _message(msg)
|
||||
{}
|
||||
|
||||
|
||||
// explicit is not used here because
|
||||
// throw SituationMap::Exception(__FILE__, __LINE__, "Message" );
|
||||
// will become more complicated
|
||||
|
||||
Exception(const char *Source
|
||||
, unsigned int lineNo
|
||||
, const char *msg)
|
||||
: Exception(QLatin1String(Source), lineNo, QLatin1String(msg))
|
||||
{}
|
||||
|
||||
Exception(const char *Source
|
||||
, unsigned int lineNo
|
||||
, const QString &msg)
|
||||
: Exception(QLatin1String(Source), lineNo, msg)
|
||||
{}
|
||||
|
||||
Exception(const QString &Source
|
||||
, unsigned int lineNo
|
||||
, const QString &msg)
|
||||
: _message(QStringLiteral("\"%1\" in %2 at %3").arg(msg, Source).arg(lineNo))
|
||||
{}
|
||||
|
||||
~Exception() = default;
|
||||
Exception &operator = (const Exception &e) = default;
|
||||
|
||||
|
||||
QString getMessage() const { return _message; } //!< returns a specific error message as QString
|
||||
|
||||
protected:
|
||||
|
||||
QString _message;
|
||||
|
||||
};
|
||||
|
||||
} // namespace SituationMap
|
||||
Reference in new issue
Block a user