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>
59 lines
1.4 KiB
C++
59 lines
1.4 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Generate enum access functions (static enums, values from xml-file)
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
#pragma once
|
|
|
|
#include "codegen_export.h"
|
|
#include "XmlReader.h"
|
|
#include <QObject>
|
|
#include <QSharedPointer>
|
|
|
|
namespace NGL
|
|
{
|
|
class INGLLogger;
|
|
}
|
|
|
|
namespace Grantlee
|
|
{
|
|
class Context;
|
|
class Engine;
|
|
class TemplateImpl;
|
|
using Template = QSharedPointer<TemplateImpl>;
|
|
}
|
|
namespace CodeGen
|
|
{
|
|
class StructBuilder;
|
|
|
|
class GeneratorGrantleeBase : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
virtual ~GeneratorGrantleeBase();
|
|
virtual bool init(const XmlReader *reader, StructBuilder *structBuilder) = 0;
|
|
bool setTemplate(const QString &templateName, const QString &tmpl);
|
|
QString render() const;
|
|
QString errorString() const;
|
|
bool generateData(const QString &templateName,
|
|
const QString &outDirectory);
|
|
|
|
protected:
|
|
explicit GeneratorGrantleeBase(const char *loggerName);
|
|
|
|
bool initInternal(const XmlReader *reader, StructBuilder *structBuilder);
|
|
bool readFile(const QString &filename, QString &data) const;
|
|
bool getFilenameFromData(const QString &dataToParse, QString &filename) const;
|
|
void addCustomFunctions(const QVector<CustomServiceFunctionInformation> &customFunctions);
|
|
void exportUsedServices(const XmlReader *reader);
|
|
protected:
|
|
Grantlee::Engine *m_engine;
|
|
Grantlee::Context *m_ctx;
|
|
Grantlee::Template m_template;
|
|
StructBuilder *m_structBuilder;
|
|
NGL::INGLLogger &m_logger;
|
|
};
|
|
} // namespace CodeGen
|