torstenandCopilot
7173785915
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>
27 lines
1.3 KiB
C++
27 lines
1.3 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* TabAdlerPlugin for AdlerJson Plugin
|
|
* $Id: plugin.cpp 62304 2024-03-21 08:17:45Z ewert_j $
|
|
* $HeadURL: svn://slssvn/TDS/branches/product/features/ufom/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/plugin.cpp $
|
|
* $Author: ewert_j $
|
|
* Created by Julius Ewert, ESIM, 2024-03-20
|
|
*/
|
|
|
|
#include "plugin.h"
|
|
#include "main_dispatcher.h"
|
|
#include <nglsettings/nglsettings_settings.h>
|
|
#include <TrainingAreaBase/dds_handler.h>
|
|
|
|
namespace AdlerJson
|
|
{
|
|
std::shared_ptr<TrainingAreaBase::Plugin::Interface> TabAdlerPlugin::createInterface(TrainingAreaBase::Plugin::DataProvider *pdp,
|
|
const std::shared_ptr<TrainingAreaBase::RecvFromTab> &recvFromTabCb,
|
|
const std::shared_ptr<TrainingAreaBase::TxMixin> &sendToTab,
|
|
const std::shared_ptr<TrainingAreaBase::DdsHandler> &ddsHandler,
|
|
NGL::Settings *settings)
|
|
{
|
|
return std::make_shared<MainDispatcher>(pdp, recvFromTabCb, sendToTab,ddsHandler, settings);
|
|
//return std::make_shared<MainDispatcher>(pdp, recvFromTabCb, sendToTab, settings);
|
|
};
|
|
} // namespace AdlerJson
|