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>
95 lines
4.5 KiB
C++
95 lines
4.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* Header file which holds all occuring JSON keys
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Hannes Fritsche, SLSE, 2017-09-07
|
|
*/
|
|
#pragma once
|
|
|
|
#include <QtCore/QString>
|
|
|
|
namespace CombatNetRadio
|
|
{
|
|
namespace WebSocketInterface
|
|
{
|
|
namespace JsonKeys
|
|
{
|
|
// TODO: add constexpr once we do no longer support msvc2013
|
|
// root keys
|
|
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 GET_ESSENTIALS() { return QStringLiteral("getEssentials"); }
|
|
inline QString GET_CONFIG_CNR() { return QLatin1String("getConfigCNR"); }
|
|
inline QString GET_POSITIONS_CNR() { return QLatin1String("getPositionsCNR"); }
|
|
inline QString ALIVE_REQUEST() { return QLatin1String("aliveRequest"); }
|
|
inline QString ERROR_() { return QLatin1String("error"); }
|
|
|
|
// types for server --> client messages
|
|
inline QString TRAINING_AREA() { return QLatin1String("trainingArea"); }
|
|
inline QString RADIO_STATION() { return QLatin1String("radioStation"); }
|
|
inline QString POSITIONS_CNR() { return QLatin1String("positionsCNR"); }
|
|
inline QString UPDATE() { return QLatin1String("update"); }
|
|
inline QString ALIVE_RESPONSE() { return QLatin1String("aliveResponse"); }
|
|
|
|
// types for both directions
|
|
inline QString OK() { return QStringLiteral("ok"); }
|
|
inline QString CONFIG_CNR() { return QLatin1String("configCNR"); }
|
|
|
|
// data keys
|
|
inline QString ID() { return QLatin1String("id"); }
|
|
inline QString DESIGNATION() { return QLatin1String("designation"); }
|
|
inline QString PATH() { return QLatin1String("path"); }
|
|
inline QString GEO_POINT() { return QLatin1String("geoPoint"); }
|
|
inline QString LATITUDE() { return QLatin1String("lat"); }
|
|
inline QString LONGITUDE() { return QLatin1String("lon"); }
|
|
inline QString POINT() { return QLatin1String("point"); }
|
|
inline QString X() { return QLatin1String("x"); }
|
|
inline QString Y() { return QLatin1String("y"); }
|
|
inline QString REF_POINT() { return QLatin1String("refPoint"); }
|
|
inline QString MGRS() { return QLatin1String("MGRS"); }
|
|
inline QString TRAINING_AREA_ID() { return QLatin1String("trainingAreaId"); }
|
|
inline QString TIME() { return QLatin1String("time"); }
|
|
inline QString RADIO_CIRCUIT() { return QLatin1String("radioCircuit"); }
|
|
inline QString RC_ID() { return QLatin1String("rcId"); }
|
|
inline QString SSRC() { return QLatin1String("SSRC"); }
|
|
inline QString RC_NAME() { return QLatin1String("rcName"); }
|
|
inline QString IS_ROAMING() { return QLatin1String("isRoaming"); }
|
|
inline QString SUB_CIRCUIT() { return QLatin1String("subCircuit"); }
|
|
inline QString RC_SUB_ID() { return QLatin1String("rcSubId"); }
|
|
inline QString RC_SUB_NAME() { return QLatin1String("rcSubName"); }
|
|
inline QString RC_MODE() { return QLatin1String("rcMode"); }
|
|
inline QString STATION() { return QLatin1String("station"); }
|
|
inline QString PT_SIG() { return QLatin1String("ptSig"); }
|
|
inline QString RC_TYPE() { return QLatin1String("rcType"); }
|
|
inline QString CROSSBEAM() { return QLatin1String("crossbeam"); }
|
|
inline QString ORIENTATION() { return QLatin1String("orientation"); }
|
|
inline QString FREQUENCY() { return QLatin1String("frequency"); }
|
|
inline QString AKW() { return QLatin1String("AKW"); }
|
|
inline QString FSB() { return QLatin1String("FSB"); }
|
|
inline QString RC_AKW() { return QLatin1String("rcAKW"); }
|
|
inline QString COMSEC() { return QLatin1String("COMSEC"); }
|
|
inline QString MODULATION_TYPE() { return QLatin1String("modulationType"); }
|
|
inline QString CHANNEL_SPACING() { return QLatin1String("channelSpacing"); }
|
|
inline QString SQUELCH() { return QLatin1String("squelch"); }
|
|
inline QString CLIPPER() { return QLatin1String("clipper"); }
|
|
inline QString AGC() { return QLatin1String("agc"); }
|
|
inline QString REPEAT() { return QLatin1String("repeat"); }
|
|
inline QString ERROR_CLASS() { return QLatin1String("errorClass"); }
|
|
inline QString ERROR_MESSAGE() { return QLatin1String("errorMessage"); }
|
|
inline QString MESSAGE_TYPE() { return QLatin1String("msgType"); }
|
|
inline QString INFO() { return QLatin1String("info"); }
|
|
inline QString SET_ID() { return QLatin1String("setId"); }
|
|
inline QString POSITIONS() { return QLatin1String("positions"); }
|
|
inline QString REQUESTER() { return QLatin1String("requester"); }
|
|
inline QString REASON() { return QLatin1String("reason"); }
|
|
inline QString ISACTIVECLIENT() { return QLatin1String("isActiveClient"); }
|
|
|
|
} // namespace JsonKeys
|
|
} // namespace WebSocketInterface
|
|
} // namespace CombatNetRadio
|