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>
99 lines
2.6 KiB
C++
99 lines
2.6 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* GenericBase
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
*/
|
|
|
|
#include "generic_base.h"
|
|
|
|
#include <NGLLogger/NGLLoggerBootstrap.h>
|
|
#include <QStringList>
|
|
#include <QMetaMethod>
|
|
|
|
namespace DDS
|
|
{
|
|
namespace Helper
|
|
{
|
|
|
|
static inline bool endsWith(std::string const &str, std::string const &end)
|
|
{
|
|
if (end.size() > str.size())
|
|
return false;
|
|
return std::equal(end.rbegin(), end.rend(), str.rbegin());
|
|
}
|
|
|
|
static inline std::string getSimpleTopicName(const std::string &fqName)
|
|
{
|
|
const size_t idx = fqName.rfind("::");
|
|
if (idx == std::string::npos)
|
|
return fqName;
|
|
return fqName.substr(idx + 2);
|
|
}
|
|
|
|
std::string getFunctionTopicName(const std::string &fqName)
|
|
{
|
|
const std::string ftName = getSimpleTopicName(fqName);
|
|
static const std::string request("Request");
|
|
static const std::string reply("Reply");
|
|
if (endsWith(ftName, request))
|
|
return ftName.substr(0, ftName.size() - request.size());
|
|
if (endsWith(ftName, reply))
|
|
return ftName.substr(0, ftName.size() - reply.size());
|
|
return ftName;
|
|
}
|
|
|
|
std::string getShortTopicName(const std::string &fqName)
|
|
{
|
|
// add short project name instead of long project namespace (with ::)
|
|
// i. e. Lts::SpatialData => LTS_SpatialData
|
|
return std::string("LTS_") + getSimpleTopicName(fqName);
|
|
}
|
|
|
|
QMetaMethod getMethod(NGL::INGLLogger &logger,
|
|
QObject *objectToInform,
|
|
const char *slotToExecute,
|
|
const char *signalSignature,
|
|
bool bWarnOnEmptySlot)
|
|
{
|
|
QMetaMethod ret;
|
|
if(!slotToExecute || !objectToInform)
|
|
{
|
|
if(bWarnOnEmptySlot)
|
|
WARNING_LOG(logger) << "invalid arguments to getMethod()";
|
|
return ret;
|
|
}
|
|
|
|
int slotCode = slotToExecute[0] - '0';
|
|
// check if it's really a signal or slot
|
|
if(slotCode != QSLOT_CODE && slotCode != QSIGNAL_CODE)
|
|
{
|
|
ERROR_LOG(logger) << "Use the SLOT or SIGNAL macro for slot name!";
|
|
return ret;
|
|
}
|
|
|
|
slotToExecute++; // skip code
|
|
const QMetaObject *mo = objectToInform->metaObject();
|
|
const QByteArray slot = QMetaObject::normalizedSignature(slotToExecute);
|
|
const int indexOfSlot = mo->indexOfSlot(slot.data());
|
|
|
|
if(indexOfSlot < 0)
|
|
{
|
|
WARNING_LOG(logger) << "No such slot " << mo->className() << "::" << slot;
|
|
return ret;
|
|
}
|
|
const QByteArray signal = QMetaObject::normalizedSignature(signalSignature);
|
|
if(!QMetaObject::checkConnectArgs(signal.data(), slot.data()))
|
|
{
|
|
WARNING_LOG(logger) << "Incompatible slot arguments " << mo->className() << "::"
|
|
<< slot << ", must be: " << signal;
|
|
return ret;
|
|
}
|
|
return mo->method(indexOfSlot);
|
|
}
|
|
} // namespace Helper
|
|
} // namespace DDS
|
|
|
|
|