Commit b7944375 authored by Volker Krause's avatar Volker Krause
Browse files

Better folder name for the ASN.1 related code

We'll also need uPER decoding code here for ERA FCB tickets, for which the
TLV term no longer applies.
parent cfaaa681
......@@ -4,7 +4,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include <tlv/berelement.h>
#include <asn1/berelement.h>
#include <QObject>
#include <QTest>
......
......@@ -4,7 +4,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include <tlv/berelement.h>
#include <asn1/berelement.h>
#include <QBuffer>
#include <QObject>
......
......@@ -8,6 +8,8 @@ add_library(KPimItinerary ${kitinerary_lib_srcs})
add_library(KPim::Itinerary ALIAS KPimItinerary)
target_sources(KPimItinerary PRIVATE
asn1/berelement.cpp
datatypes/action.cpp
datatypes/boattrip.cpp
datatypes/brand.cpp
......@@ -99,8 +101,6 @@ target_sources(KPimItinerary PRIVATE
text/terminalfinder.cpp
text/timefinder.cpp
tlv/berelement.cpp
uic9183/rct2ticket.cpp
uic9183/uic9183block.cpp
uic9183/uic9183head.cpp
......@@ -301,12 +301,12 @@ ecm_generate_headers(KItinerary_Pdf_FORWARDING_HEADERS
REQUIRED_HEADERS KItinerary_Pdf_HEADERS
RELATIVE pdf
)
ecm_generate_headers(KItinerary_Tlv_FORWARDING_HEADERS
ecm_generate_headers(KItinerary_Asn1_FORWARDING_HEADERS
HEADER_NAMES
BERElement
PREFIX KItinerary
REQUIRED_HEADERS KItinerary_Tlv_HEADERS
RELATIVE tlv
REQUIRED_HEADERS KItinerary_Asn1_HEADERS
RELATIVE asn1
)
ecm_generate_headers(KItinerary_Uic9183_FORWARDING_HEADERS
HEADER_NAMES
......@@ -336,13 +336,13 @@ ecm_generate_headers(KItinerary_Vdv_FORWARDING_HEADERS
install(TARGETS KPimItinerary EXPORT KPimItineraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${KItinerary_FORWARDING_HEADERS}
${KItinerary_KnowledgeDb_FORWARDING_HEADERS}
${KItinerary_Asn1_FORWARDING_HEADERS}
${KItinerary_Datatypes_FORWARDING_HEADERS}
${KItinerary_Engine_FORWARDING_HEADERS}
${KItinerary_Era_FORWARDING_HEADERS}
${KItinerary_Iata_FORWARDING_HEADERS}
${KItinerary_KnowledgeDb_FORWARDING_HEADERS}
${KItinerary_Pdf_FORWARDING_HEADERS}
${KItinerary_Tlv_FORWARDING_HEADERS}
${KItinerary_Uic9183_FORWARDING_HEADERS}
${KItinerary_Vdv_FORWARDING_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_PIM}/KItinerary
......@@ -350,12 +350,12 @@ install(FILES
install(FILES
${KItinerary_HEADERS}
${KItinerary_AirportDb_HEADERS}
${KItinerary_Asn1_HEADERS}
${KItinerary_Datatypes_HEADERS}
${KItinerary_KnowledgeDb_HEADERS}
${KItinerary_Engine_HEADERS}
${KItinerary_Era_HEADERS}
${KItinerary_Iata_HEADERS}
${KItinerary_Tlv_HEADERS}
${KItinerary_Pdf_HEADERS}
${KItinerary_Uic9183_HEADERS}
${KItinerary_Vdv_HEADERS}
......
......@@ -8,7 +8,7 @@
#include "vdvdata_p.h"
#include "iso9796_2decoder_p.h"
#include "../tlv/berelement.h"
#include "../asn1/berelement.h"
#include <QDate>
#include <QDebug>
......
......@@ -9,7 +9,7 @@
#include "vdvdata_p.h"
#include "logging.h"
#include "../tlv/berelement.h"
#include "../asn1/berelement.h"
#include <QDebug>
......
......@@ -10,7 +10,7 @@
#include "iso9796_2decoder_p.h"
#include "logging.h"
#include "../tlv/berelement.h"
#include "../asn1/berelement.h"
#include <QByteArray>
#include <QDebug>
......
......@@ -4,6 +4,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "../lib/asn1/berelement.h"
#include "../lib/era/ssbv1ticket.h"
#include "../lib/era/ssbv2ticket.h"
#include "../lib/era/ssbv3ticket.h"
......@@ -12,7 +13,6 @@
#include "../lib/uic9183/uic9183header.h"
#include "../lib/uic9183/vendor0080vublockdata.h"
#include "../lib/vdv/vdvticketcontent.h"
#include "../lib/tlv/berelement.h"
#include <kitinerary_version.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment