QtLocationPlugin: Move Providers To Separate Folder

mavlink · Sep 19, 2024 · 95ace95 · 95ace95
1 parent 5b1b6aa
commit 95ace95
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 34 deletions.
diff --git a/src/QtLocationPlugin/CMakeLists.txt b/src/QtLocationPlugin/CMakeLists.txt
@@ -3,20 +3,20 @@ find_package(Qt6 REQUIRED COMPONENTS Core Location Network Positioning Qml Sql)
 qt_add_plugin(QGCLocation STATIC
     CLASS_NAME QGeoServiceProviderFactoryQGC
     OUTPUT_TARGETS QGCLocation_targets
-    BingMapProvider.cpp
-    BingMapProvider.h
-    ElevationMapProvider.cpp
-    ElevationMapProvider.h
-    EsriMapProvider.cpp
-    EsriMapProvider.h
-    GenericMapProvider.cpp
-    GenericMapProvider.h
-    GoogleMapProvider.cpp
-    GoogleMapProvider.h
-    MapboxMapProvider.cpp
-    MapboxMapProvider.h
-    MapProvider.cpp
-    MapProvider.h
+    Providers/BingMapProvider.cpp
+    Providers/BingMapProvider.h
+    Providers/ElevationMapProvider.cpp
+    Providers/ElevationMapProvider.h
+    Providers/EsriMapProvider.cpp
+    Providers/EsriMapProvider.h
+    Providers/GenericMapProvider.cpp
+    Providers/GenericMapProvider.h
+    Providers/GoogleMapProvider.cpp
+    Providers/GoogleMapProvider.h
+    Providers/MapboxMapProvider.cpp
+    Providers/MapboxMapProvider.h
+    Providers/MapProvider.cpp
+    Providers/MapProvider.h
     QGCCachedTileSet.cpp
     QGCCachedTileSet.h
     QGCCacheTile.h
@@ -45,7 +45,6 @@ qt_add_plugin(QGCLocation STATIC
     QMLControl/QGCMapEngineManager.h
 )
 
-target_compile_definitions(QGCLocation PRIVATE CMAKE_LOCATION_PLUGIN)
 if(IOS)
     target_compile_definitions(QGCLocation PRIVATE QGC_NO_GOOGLE_MAPS)
 endif()
@@ -68,6 +67,7 @@ target_link_libraries(QGCLocation
 target_include_directories(QGCLocation
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
+        Providers
         QMLControl
 )
 

diff --git a/src/QtLocationPlugin/BingMapProvider.cpp → ...ationPlugin/Providers/BingMapProvider.cpp b/src/QtLocationPlugin/BingMapProvider.cpp → ...ationPlugin/Providers/BingMapProvider.cpp
diff --git a/src/QtLocationPlugin/BingMapProvider.h → ...ocationPlugin/Providers/BingMapProvider.h b/src/QtLocationPlugin/BingMapProvider.h → ...ocationPlugin/Providers/BingMapProvider.h
diff --git a/...QtLocationPlugin/ElevationMapProvider.cpp → ...Plugin/Providers/ElevationMapProvider.cpp b/...QtLocationPlugin/ElevationMapProvider.cpp → ...Plugin/Providers/ElevationMapProvider.cpp
diff --git a/src/QtLocationPlugin/ElevationMapProvider.h → ...onPlugin/Providers/ElevationMapProvider.h b/src/QtLocationPlugin/ElevationMapProvider.h → ...onPlugin/Providers/ElevationMapProvider.h
diff --git a/src/QtLocationPlugin/EsriMapProvider.cpp → ...ationPlugin/Providers/EsriMapProvider.cpp b/src/QtLocationPlugin/EsriMapProvider.cpp → ...ationPlugin/Providers/EsriMapProvider.cpp
diff --git a/src/QtLocationPlugin/EsriMapProvider.h → ...ocationPlugin/Providers/EsriMapProvider.h b/src/QtLocationPlugin/EsriMapProvider.h → ...ocationPlugin/Providers/EsriMapProvider.h
diff --git a/src/QtLocationPlugin/GenericMapProvider.cpp → ...onPlugin/Providers/GenericMapProvider.cpp b/src/QtLocationPlugin/GenericMapProvider.cpp → ...onPlugin/Providers/GenericMapProvider.cpp
diff --git a/src/QtLocationPlugin/GenericMapProvider.h → ...tionPlugin/Providers/GenericMapProvider.h b/src/QtLocationPlugin/GenericMapProvider.h → ...tionPlugin/Providers/GenericMapProvider.h
diff --git a/src/QtLocationPlugin/GoogleMapProvider.cpp → ...ionPlugin/Providers/GoogleMapProvider.cpp b/src/QtLocationPlugin/GoogleMapProvider.cpp → ...ionPlugin/Providers/GoogleMapProvider.cpp
diff --git a/src/QtLocationPlugin/GoogleMapProvider.h → ...ationPlugin/Providers/GoogleMapProvider.h b/src/QtLocationPlugin/GoogleMapProvider.h → ...ationPlugin/Providers/GoogleMapProvider.h
diff --git a/src/QtLocationPlugin/MapProvider.cpp → ...tLocationPlugin/Providers/MapProvider.cpp b/src/QtLocationPlugin/MapProvider.cpp → ...tLocationPlugin/Providers/MapProvider.cpp
diff --git a/src/QtLocationPlugin/MapProvider.h → src/QtLocationPlugin/Providers/MapProvider.h b/src/QtLocationPlugin/MapProvider.h → src/QtLocationPlugin/Providers/MapProvider.h
diff --git a/src/QtLocationPlugin/MapboxMapProvider.cpp → ...ionPlugin/Providers/MapboxMapProvider.cpp b/src/QtLocationPlugin/MapboxMapProvider.cpp → ...ionPlugin/Providers/MapboxMapProvider.cpp
diff --git a/src/QtLocationPlugin/MapboxMapProvider.h → ...ationPlugin/Providers/MapboxMapProvider.h b/src/QtLocationPlugin/MapboxMapProvider.h → ...ationPlugin/Providers/MapboxMapProvider.h
diff --git a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
@@ -4,18 +4,8 @@
 
 QGC_LOGGING_CATEGORY(QGeoServiceProviderFactoryQGCLog, "qgc.qtlocationplugin.qgeoserviceproviderfactoryqgc")
 
-#ifndef CMAKE_LOCATION_PLUGIN
-extern "C" Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QPluginMetaData) qt_plugin_query_metadata_v2();
-extern "C" Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance();
-
-const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFactoryQGC()
-{
-    QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, qt_plugin_query_metadata_v2};
-    return plugin;
-}
-#endif
-
-QGeoServiceProviderFactoryQGC::QGeoServiceProviderFactoryQGC()
+QGeoServiceProviderFactoryQGC::QGeoServiceProviderFactoryQGC(QObject *parent)
+    : QObject(parent)
 {
     qCDebug(QGeoServiceProviderFactoryQGCLog) << Q_FUNC_INFO << this;
 }
@@ -76,8 +66,3 @@ QPlaceManagerEngine* QGeoServiceProviderFactoryQGC::createPlaceManagerEngine(
     }
     return nullptr;
 }
-
-void QGeoServiceProviderFactoryQGC::setQmlEngine(QQmlEngine *engine)
-{
-    m_engine = engine;
-}
diff --git a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.h b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.h
@@ -14,15 +14,15 @@ class QGeoServiceProviderFactoryQGC: public QObject, public QGeoServiceProviderF
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/6.0" FILE "qgc_maps_plugin.json")
 
 public:
-    QGeoServiceProviderFactoryQGC();
+    QGeoServiceProviderFactoryQGC(QObject *parent = nullptr);
     ~QGeoServiceProviderFactoryQGC();
 
     QGeoCodingManagerEngine* createGeocodingManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const final;
     QGeoMappingManagerEngine* createMappingManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const final;
     QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const final;
     QPlaceManagerEngine* createPlaceManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const final;
 
-    void setQmlEngine(QQmlEngine* engine) final;
+    void setQmlEngine(QQmlEngine* engine) final { m_engine = engine; }
 
 private:
     QQmlEngine* m_engine = nullptr;