Move code to src/ directly

The extra folder is not necessary now that this is in a separate repo.

CMakeLists.txt

@@ -4,7 +4,7 @@ project(itinerary VERSION 0.0.1)
 find_package(ECM 5.38 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
 
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMAddTests)
 include(ECMGenerateHeaders)
 include(ECMQtDeclareLoggingCategory)

autotests/pkpasstest.cpp

@@ -27,10 +27,10 @@
 class PkPassTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase()
     {
-        QLocale::setDefault(QLocale("de_DE"));
+        QLocale::setDefault(QLocale(QStringLiteral("de_DE")));
     }
 
     void testBoardingPass()

src/CMakeLists.txt

-add_subdirectory(pkpass)
+set(pkpass_srcs
+    barcode.cpp
+    boardingpass.cpp
+    field.cpp
+    location.cpp
+    pass.cpp
+)
+ecm_qt_declare_logging_category(pkpass_srcs
+    HEADER logging.h
+    IDENTIFIER KPkPass::Log
+    CATEGORY_NAME org.kde.pkpass
+)
+
+add_library(KPkPass SHARED ${pkpass_srcs})
+generate_export_header(KPkPass BASE_NAME KPkPass)
+set_target_properties(KPkPass PROPERTIES
+    VERSION ${ITINERARY_VERSION_STRING}
+    SOVERSION ${ITINERARY_SOVERSION}
+    EXPORT_NAME KPkPass
+)
+target_include_directories(KPkPass INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}>")
+target_link_libraries(KPkPass
+    PUBLIC
+        Qt5::Gui
+    PRIVATE
+        KF5::Archive
+)
+
+ecm_generate_headers(KPkPass_HEADERS
+    HEADER_NAMES
+        Barcode
+        BoardingPass
+        Field
+        Location
+        Pass
+    REQUIRED_HEADERS KPkPass_HEADERS
+)
+
+install(TARGETS KPkPass EXPORT KPkPassTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES
+    ${KPkPass_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/kpkpass_export.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPkPass
+)
+
+if (NOT ANDROID)
+    install(FILES application-vnd-apple-pkpass.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+    update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+endif()

src/pkpass/CMakeLists.txt

-include(KDECompilerSettings NO_POLICY_SCOPE)
-
-set(pkpass_srcs
-    barcode.cpp
-    boardingpass.cpp
-    field.cpp
-    location.cpp
-    pass.cpp
-)
-ecm_qt_declare_logging_category(pkpass_srcs
-    HEADER logging.h
-    IDENTIFIER KPkPass::Log
-    CATEGORY_NAME org.kde.pkpass
-)
-
-add_library(KPkPass SHARED ${pkpass_srcs})
-generate_export_header(KPkPass BASE_NAME KPkPass)
-set_target_properties(KPkPass PROPERTIES
-    VERSION ${ITINERARY_VERSION_STRING}
-    SOVERSION ${ITINERARY_SOVERSION}
-    EXPORT_NAME KPkPass
-)
-target_include_directories(KPkPass INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}>")
-target_link_libraries(KPkPass
-    PUBLIC
-        Qt5::Gui
-    PRIVATE
-        KF5::Archive
-)
-
-ecm_generate_headers(KPkPass_HEADERS
-    HEADER_NAMES
-        Barcode
-        BoardingPass
-        Field
-        Location
-        Pass
-    REQUIRED_HEADERS KPkPass_HEADERS
-)
-
-install(TARGETS KPkPass EXPORT KPkPassTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES
-    ${KPkPass_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/kpkpass_export.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPkPass
-)
-
-if (NOT ANDROID)
-    install(FILES application-vnd-apple-pkpass.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-    update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
-endif()