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>
80 lines
3.7 KiB
C++
80 lines
3.7 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Header file which holds all occuring JSON keys
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, SLST, 2017-12-05
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QString>
|
|
|
|
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
|
|
|
|
namespace TrainingAreaBase
|
|
{
|
|
namespace WebSocketInterface
|
|
{
|
|
/**
|
|
* @brief Namespace which holds all occuring JSON keys as const QString objects
|
|
*/
|
|
namespace JsonKeys
|
|
{
|
|
inline QString DATA() { return QLatin1String("data"); }
|
|
inline QString UUID_() { return QStringLiteral("uuid"); } // Windows: typedef GUID UUUID; ...
|
|
inline QString TYPE() { return QStringLiteral("type"); }
|
|
|
|
// types for client --> server messages
|
|
inline QString SEND_BITE_REQUEST() { return QStringLiteral("sendBiteRequest"); }
|
|
|
|
// types for server --> client messages
|
|
inline QString BITE_DATA() { return QStringLiteral("biteData"); }
|
|
inline QString POSITION_DATA() { return QStringLiteral("positionData"); }
|
|
inline QString OK() { return QStringLiteral("ok");}
|
|
inline QString ERROR_() { return QLatin1String("error"); }
|
|
|
|
// data keys
|
|
inline QString EXERCISE_ID() { return QStringLiteral("exerciseId"); }
|
|
inline QString FILE_CATEGORY() { return QStringLiteral("fileCategory"); }
|
|
inline QString FILE_ID() { return QStringLiteral("fileId"); }
|
|
inline QString FILE_SIZE() { return QStringLiteral("fileSize"); }
|
|
inline QString FILE_STATUS() { return QStringLiteral("fileStatus"); }
|
|
inline QString FOLDER_ID() { return QStringLiteral("folderId"); }
|
|
inline QString IS_TEMPLATE() { return QStringLiteral("isTemplate"); }
|
|
inline QString NAME() { return QStringLiteral("name"); }
|
|
inline QString OPERATOR_ID() { return QStringLiteral("operatorID"); }
|
|
inline QString PHASE_ID() { return QStringLiteral("phaseId"); }
|
|
inline QString PROPERTIES() { return QStringLiteral("properties"); }
|
|
|
|
inline QString EQUIP_NO() { return QLatin1String("equipNo"); }
|
|
inline QString BOX() { return QLatin1String("box"); }
|
|
inline QString LAST_UPDATE() { return QLatin1String("lastUpdate"); }
|
|
inline QString BITE_ERRORS() { return QLatin1String("biteErrors"); }
|
|
inline QString ERROR_TEXT() { return QLatin1String("errorText"); }
|
|
inline QString LANG() { return QLatin1String("lang"); }
|
|
inline QString _TEXT() { return QLatin1String("text"); }
|
|
inline QString DEVICE_ID() { return QLatin1String("deviceId"); }
|
|
inline QString SUBDEVICE() { return QLatin1String("subdevice"); }
|
|
inline QString UNIQUE_ID() { return QLatin1String("uniqueId"); }
|
|
inline QString ERROR_NO() { return QLatin1String("errorNo"); }
|
|
inline QString CONFIGURATION_ERRORS() { return QLatin1String("configurationErrors"); }
|
|
inline QString COMPONENT_NAME() { return QLatin1String("componentName"); }
|
|
inline QString BASIC_ERRORS() { return QLatin1String("basicErrors"); }
|
|
inline QString LAST_POSITION_UPDATE() { return QLatin1String("lastPositionUpdate"); }
|
|
inline QString IS_LICENSED() { return QLatin1String("isLicensed"); }
|
|
|
|
inline QString POS_LAT() { return QLatin1String("posX"); }
|
|
inline QString POS_LON() { return QLatin1String("posY"); }
|
|
inline QString POS_Z() { return QLatin1String("posZ"); }
|
|
|
|
inline QString INFO() { return QLatin1String("info"); }
|
|
inline QString ERROR_CLASS() { return QLatin1String("errorClass"); }
|
|
inline QString ERROR_MESSAGE() { return QLatin1String("errorMessage"); }
|
|
inline QString MESSAGE_TYPE() { return QLatin1String("msgType"); }
|
|
|
|
|
|
} // namespace JsonKeys
|
|
} // namespace WebSocketInterface
|
|
} // namespace TrainingAreaBase
|