Move IataBcbpParser to the iata/ subdir as well

autotests/bcbpparsertest.cpp

@@ -4,9 +4,8 @@
     SPDX-License-Identifier: LGPL-2.0-or-later
 */
 
-#include "iatabcbpparser.h"
-
 #include "../lib/iata/iatabcbp.h"
+#include "../lib/iata/iatabcbpparser.h"
 
 #include <KItinerary/JsonLdDocument>
 #include <KItinerary/Organization>

src/lib/CMakeLists.txt

@@ -41,6 +41,7 @@ set(kitinerary_lib_srcs
     extractors/iatabcbpextractor.cpp
 
     iata/iatabcbp.cpp
+    iata/iatabcbpparser.cpp
     iata/iatabcbpsections.cpp
 
     jsapi/barcode.cpp
@@ -110,7 +111,6 @@ set(kitinerary_lib_srcs
     file.cpp
     flightpostprocessor.cpp
     htmldocument.cpp
-    iatabcbpparser.cpp
     jsonlddocument.cpp
     jsonldimportfilter.cpp
     locationutil.cpp

src/lib/extractorpostprocessor.cpp

@@ -11,7 +11,7 @@
 #include "flightpostprocessor_p.h"
 
 #include "extractorutil.h"
-#include "iatabcbpparser.h"
+#include "iata/iatabcbpparser.h"
 #include "jsonlddocument.h"
 #include "logging.h"
 #include "mergeutil.h"

src/lib/extractors/iatabcbpextractor.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "iatabcbpextractor.h"
-#include <iatabcbpparser.h>
+#include <iata/iatabcbpparser.h>
 
 #include <KItinerary/ExtractorDocumentNode>
 #include <KItinerary/ExtractorResult>

src/lib/iatabcbpparser.h → src/lib/iata/iatabcbpparser.h

@@ -32,13 +32,13 @@ namespace IataBcbpParser
  *  @param externalIssueDate The date the boarding pass was issued (or a sufficiently close approximation).
  *  This is necessary as by default the BCBP data only contains day and month of the flight, not the year.
  */
-KITINERARY_EXPORT QVector<QVariant> parse(const QString &message, const QDate &externalIssueDate = QDate());
+QVector<QVariant> parse(const QString &message, const QDate &externalIssueDate = QDate());
 KITINERARY_EXPORT QVector<QVariant> parse(const IataBcbp &bcbp, const QDate &contextDate);
 
 /** Quickly test if @p message could be a IATA BCBP code.
  *  This optimizes for speed rather than correctness, for use in barcode content auto-detection.
  */
-KITINERARY_EXPORT bool maybeIataBcbp(const QString &message);
+bool maybeIataBcbp(const QString &message);
 }
 
 }