move POILookupModule to client library

Framstag · Dec 9, 2023 · 09d1a0f · 09d1a0f
1 parent 1b12ca5
commit 09d1a0f
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 deletions.
diff --git a/Tests/src/HeaderCheck.cpp b/Tests/src/HeaderCheck.cpp
@@ -141,7 +141,9 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutclient => osmscout",
     "osmscoutclient => osmscout.async",
     "osmscoutclient => osmscout.db",
+    "osmscoutclient => osmscout.feature",
     "osmscoutclient => osmscout.io",
+    "osmscoutclient => osmscout.poi",
     "osmscoutclient => osmscout.routing",
     "osmscoutclient => osmscout.util",
     "osmscoutclient => osmscout.location",
@@ -157,7 +159,6 @@ static const std::set<std::string> allowedDependencies{
     "osmscoutclientqt => osmscout.feature",
     "osmscoutclientqt => osmscout.elevation",
     "osmscoutclientqt => osmscout.location",
-    "osmscoutclientqt => osmscout.poi",
     "osmscoutclientqt => osmscout.routing",
     "osmscoutclientqt => osmscout.navigation",
     "osmscoutclientqt => osmscout",

diff --git a/libosmscout-client-qt/CMakeLists.txt b/libosmscout-client-qt/CMakeLists.txt
@@ -51,7 +51,6 @@ set(HEADER_FILES
     include/osmscoutclientqt/QtStdConverters.h
     include/osmscoutclientqt/RouteStep.h
     include/osmscoutclientqt/NearPOIModel.h
-    include/osmscoutclientqt/POILookupModule.h
     include/osmscoutclientqt/InstalledMapsModel.h
     include/osmscoutclientqt/Voice.h
     include/osmscoutclientqt/VoiceManager.h
@@ -107,7 +106,6 @@ set(SOURCE_FILES
     src/osmscoutclientqt/QtSettingsStorage.cpp
     src/osmscoutclientqt/QtStdConverters.cpp
     src/osmscoutclientqt/NearPOIModel.cpp
-    src/osmscoutclientqt/POILookupModule.cpp
     src/osmscoutclientqt/InstalledMapsModel.cpp
     src/osmscoutclientqt/Voice.cpp
     src/osmscoutclientqt/VoiceManager.cpp

diff --git a/libosmscout-client-qt/include/meson.build b/libosmscout-client-qt/include/meson.build
@@ -49,7 +49,6 @@ osmscoutclientqtHeader = [
             'osmscoutclientqt/TiledMapOverlay.h',
             'osmscoutclientqt/TiledRenderingHelper.h',
             'osmscoutclientqt/NearPOIModel.h',
-            'osmscoutclientqt/POILookupModule.h',
             'osmscoutclientqt/InstalledMapsModel.h',
             'osmscoutclientqt/Voice.h',
             'osmscoutclientqt/VoiceManager.h',

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/NearPOIModel.h b/libosmscout-client-qt/include/osmscoutclientqt/NearPOIModel.h
@@ -20,8 +20,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  */
 
+#include <osmscoutclient/POILookupModule.h>
+
 #include <osmscoutclientqt/LocationEntry.h>
-#include <osmscoutclientqt/POILookupModule.h>
 
 #include <osmscoutclientqt/ClientQtImportExport.h>
 

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/OSMScoutQt.h b/libosmscout-client-qt/include/osmscoutclientqt/OSMScoutQt.h
@@ -26,6 +26,7 @@
 
 #include <osmscoutclient/MapManager.h>
 #include <osmscoutclient/DBThread.h>
+#include <osmscoutclient/POILookupModule.h>
 
 #include <osmscoutclientqt/LookupModule.h>
 #include <osmscoutclientqt/MapDownloader.h>
@@ -34,7 +35,6 @@
 #include <osmscoutclientqt/SearchModule.h>
 #include <osmscoutclientqt/StyleModule.h>
 #include <osmscoutclientqt/NavigationModule.h>
-#include <osmscoutclientqt/POILookupModule.h>
 #include <osmscoutclientqt/VoiceManager.h>
 #include <osmscoutclientqt/ElevationModule.h>
 #include <osmscoutclientqt/IconLookup.h>

diff --git a/libosmscout-client-qt/src/meson.build b/libosmscout-client-qt/src/meson.build
@@ -46,7 +46,6 @@ osmscoutclientqtSrc = [
             'src/osmscoutclientqt/TiledMapOverlay.cpp',
             'src/osmscoutclientqt/TiledRenderingHelper.cpp',
             'src/osmscoutclientqt/NearPOIModel.cpp',
-            'src/osmscoutclientqt/POILookupModule.cpp',
             'src/osmscoutclientqt/InstalledMapsModel.cpp',
             'src/osmscoutclientqt/Voice.cpp',
             'src/osmscoutclientqt/VoiceManager.cpp',

diff --git a/libosmscout-client/CMakeLists.txt b/libosmscout-client/CMakeLists.txt
@@ -11,6 +11,7 @@ set(HEADER_FILES
   include/osmscoutclient/MapProvider.h
   include/osmscoutclient/ClientImportExport.h
   include/osmscoutclient/OnlineTileProvider.h
+  include/osmscoutclient/POILookupModule.h
   include/osmscoutclient/Settings.h
   include/osmscoutclient/VoiceProvider.h
 )
@@ -23,6 +24,7 @@ set(SOURCE_FILES
   src/osmscoutclient/MapManager.cpp
   src/osmscoutclient/MapProvider.cpp
   src/osmscoutclient/OnlineTileProvider.cpp
+  src/osmscoutclient/POILookupModule.cpp
   src/osmscoutclient/Settings.cpp
   src/osmscoutclient/VoiceProvider.cpp
 )

diff --git a/libosmscout-client/include/meson.build b/libosmscout-client/include/meson.build
@@ -13,6 +13,7 @@ osmscoutclientHeader = [
             'osmscoutclient/MapManager.h',
             'osmscoutclient/MapProvider.h',
             'osmscoutclient/OnlineTileProvider.h',
+            'osmscoutclient/POILookupModule.h',
             'osmscoutclient/Settings.h',
             'osmscoutclient/VoiceProvider.h'
           ]

diff --git a/...nclude/osmscoutclientqt/POILookupModule.h → .../include/osmscoutclient/POILookupModule.h b/...nclude/osmscoutclientqt/POILookupModule.h → .../include/osmscoutclient/POILookupModule.h
@@ -1,5 +1,5 @@
-#ifndef OSMSCOUT_CLIENT_QT_POILOOKUPSERVICE_H
-#define OSMSCOUT_CLIENT_QT_POILOOKUPSERVICE_H
+#ifndef OSMSCOUT_CLIENT_POILOOKUPSERVICE_H
+#define OSMSCOUT_CLIENT_POILOOKUPSERVICE_H
 /*
  OSMScout - a Qt backend for libosmscout and libosmscout-map
  Copyright (C) 2018 Lukas Karas
@@ -19,7 +19,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  */
 
-#include <osmscoutclientqt/ClientQtImportExport.h>
+#include <osmscoutclient/ClientImportExport.h>
 
 #include <osmscoutclient/DBThread.h>
 #include <osmscoutclient/LocationInfo.h>
@@ -29,7 +29,7 @@ namespace osmscout {
 /**
  * \ingroup QtAPI
  */
-class OSMSCOUT_CLIENT_QT_API POILookupModule: public AsyncWorker
+class OSMSCOUT_CLIENT_API POILookupModule: public AsyncWorker
 {
 private:
   DBThreadRef      dbThread;
@@ -71,4 +71,4 @@ class OSMSCOUT_CLIENT_QT_API POILookupModule: public AsyncWorker
 
 }
 
-#endif //OSMSCOUT_CLIENT_QT_POILOOKUPSERVICE_H
+#endif //OSMSCOUT_CLIENT_POILOOKUPSERVICE_H
diff --git a/libosmscout-client/src/meson.build b/libosmscout-client/src/meson.build
@@ -6,6 +6,7 @@ osmscoutclientSrc = [
              'src/osmscoutclient/MapManager.cpp',
              'src/osmscoutclient/MapProvider.cpp',
              'src/osmscoutclient/OnlineTileProvider.cpp',
+             'src/osmscoutclient/POILookupModule.cpp',
              'src/osmscoutclient/Settings.cpp',
              'src/osmscoutclient/VoiceProvider.cpp'
           ]
diff --git a/.../src/osmscoutclientqt/POILookupModule.cpp → ...nt/src/osmscoutclient/POILookupModule.cpp b/.../src/osmscoutclientqt/POILookupModule.cpp → ...nt/src/osmscoutclient/POILookupModule.cpp
@@ -17,7 +17,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  */
 
-#include <osmscoutclientqt/POILookupModule.h>
+#include <osmscoutclient/POILookupModule.h>
 
 #include <osmscout/feature/OperatorFeature.h>