From 1f875de1d513c733550401ee40fa289fb2acb57e Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 24 Jul 2019 12:09:40 -0400 Subject: Initial import from github Import from http://github.com/YoshitoMomiyama/aglqtnavigation.git as of commit a6930c2, with the following minor changes: - .gitignore tweaked to remove itself - .gitreview updated Bug-AGL: SPEC-2667 Signed-off-by: Scott Murray Change-Id: I91fed0f6349bf1952e41132058929b70a2b0fe5b --- dbus_interface/dbus_interface.pro | 44 ++++++++++++++++ dbus_interface/dbus_types.h | 75 ++++++++++++++++++++++++++++ dbus_interface/org.agl.naviapi.xml | 34 +++++++++++++ dbus_interface/org.genivi.navigationcore.xml | 61 ++++++++++++++++++++++ 4 files changed, 214 insertions(+) create mode 100644 dbus_interface/dbus_interface.pro create mode 100644 dbus_interface/dbus_types.h create mode 100644 dbus_interface/org.agl.naviapi.xml create mode 100644 dbus_interface/org.genivi.navigationcore.xml (limited to 'dbus_interface') diff --git a/dbus_interface/dbus_interface.pro b/dbus_interface/dbus_interface.pro new file mode 100644 index 0000000..d647da3 --- /dev/null +++ b/dbus_interface/dbus_interface.pro @@ -0,0 +1,44 @@ +QT += dbus +TARGET = dbus_interface +TEMPLATE = lib +CONFIG += staticlib + +SOURCES += +HEADERS += \ + dbus_types.h + +XMLSOURCES = \ + org.genivi.navigationcore.xml \ + org.agl.naviapi.xml + +gen_adaptor_cpp.input = XMLSOURCES +gen_adaptor_cpp.commands = \ + qdbusxml2cpp -i $$PWD/dbus_types.h -m -a ${QMAKE_FILE_IN_BASE}_adaptor ${QMAKE_FILE_IN}; \ + moc $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adaptor.h -o $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adaptor.moc +gen_adaptor_cpp.output = ${QMAKE_FILE_IN_BASE}_adaptor.cpp +gen_adaptor_cpp.variable_out = SOURCES +gen_adaptor_cpp.clean = ${QMAKE_FILE_IN_BASE}_adaptor.cpp + +gen_adaptor_h.input = XMLSOURCES +gen_adaptor_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN} +gen_adaptor_h.depends = ${QMAKE_FILE_IN_BASE}_adaptor.cpp +gen_adaptor_h.output = ${QMAKE_FILE_IN_BASE}_adaptor.h +gen_adaptor_h.clean = ${QMAKE_FILE_IN_BASE}_adaptor.h + +gen_interface_cpp.input = XMLSOURCES +gen_interface_cpp.commands = \ + qdbusxml2cpp -i $$PWD/dbus_types.h -m -p ${QMAKE_FILE_IN_BASE}_interface ${QMAKE_FILE_IN}; \ + moc $$OUT_PWD/${QMAKE_FILE_IN_BASE}_interface.h -o $$OUT_PWD/${QMAKE_FILE_IN_BASE}_interface.moc +gen_interface_cpp.output = ${QMAKE_FILE_IN_BASE}_interface.cpp +gen_interface_cpp.variable_out = SOURCES +gen_interface_cpp.clean = ${QMAKE_FILE_IN_BASE}_interface.cpp + +gen_interface_h.input = XMLSOURCES +gen_interface_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN} +gen_interface_h.depends = ${QMAKE_FILE_IN_BASE}_interface.cpp +gen_interface_h.output = ${QMAKE_FILE_IN_BASE}_interface.h +gen_interface_h.clean = ${QMAKE_FILE_IN_BASE}_interface.h + +QMAKE_EXTRA_COMPILERS += gen_adaptor_cpp gen_adaptor_h gen_interface_cpp gen_interface_h + +DISTFILES += diff --git a/dbus_interface/dbus_types.h b/dbus_interface/dbus_types.h new file mode 100644 index 0000000..9b49adb --- /dev/null +++ b/dbus_interface/dbus_types.h @@ -0,0 +1,75 @@ +#ifndef DBUS_TYPES_H +#define DBUS_TYPES_H +#include + +#include +#include +#include +#include +#include +#include + +// for org.genivi.navigationcore +struct qPositionPairElm{ + uint8_t key; + QDBusVariant value; +}; +Q_DECLARE_METATYPE(qPositionPairElm) + +inline QDBusArgument &operator <<(QDBusArgument &argument, const qPositionPairElm &qpositionpairelm) +{ + argument.beginStructure(); + argument << qpositionpairelm.key << qpositionpairelm.value; + argument.endStructure(); + return argument; +} + +inline const QDBusArgument &operator >>(const QDBusArgument &argument, qPositionPairElm &qpositionpairelm) +{ + argument.beginStructure(); + argument >> qpositionpairelm.key; + argument >> qpositionpairelm.value; + argument.endStructure(); + return argument; +} + +typedef QMap qPosition; +Q_DECLARE_METATYPE(qPosition) + +typedef QList qValuesToReturn; +Q_DECLARE_METATYPE(qValuesToReturn) + +typedef QList> qWaypointsList; // aa{i(yv)} +Q_DECLARE_METATYPE(qWaypointsList) + +typedef QList qCalculatedRoutesList; // au + +typedef QList qRoutesList; //au + +struct qSessionsListElm{ + uint32_t key; + QString value; +}; +Q_DECLARE_METATYPE(qSessionsListElm) + +inline QDBusArgument &operator <<(QDBusArgument &argument, const qSessionsListElm &qsessionslistelm) +{ + argument.beginStructure(); + argument << qsessionslistelm.key << qsessionslistelm.value; + argument.endStructure(); + return argument; +} + +inline const QDBusArgument &operator >>(const QDBusArgument &argument, qSessionsListElm &qsessionslistelm) +{ + argument.beginStructure(); + argument >> qsessionslistelm.key; + argument >> qsessionslistelm.value; + argument.endStructure(); + return argument; +} + +typedef QList qSessionsList; // a(us) +Q_DECLARE_METATYPE(qSessionsList) + +#endif diff --git a/dbus_interface/org.agl.naviapi.xml b/dbus_interface/org.agl.naviapi.xml new file mode 100644 index 0000000..7132539 --- /dev/null +++ b/dbus_interface/org.agl.naviapi.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dbus_interface/org.genivi.navigationcore.xml b/dbus_interface/org.genivi.navigationcore.xml new file mode 100644 index 0000000..1e4704e --- /dev/null +++ b/dbus_interface/org.genivi.navigationcore.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg