Use QPointer instead of QWeakPointer

qgis · Sep 4, 2018 · 44ce897 · 44ce897
1 parent d2f52bf
commit 44ce897
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/core/qgsvectorlayerutils.cpp b/src/core/qgsvectorlayerutils.cpp
@@ -498,12 +498,15 @@ QgsFeature QgsVectorLayerUtils::duplicateFeature( QgsVectorLayer *layer, const Q
   return newFeature;
 }
 
-std::unique_ptr<QgsVectorLayerFeatureSource> QgsVectorLayerUtils::getFeatureSource( QWeakPointer<QgsVectorLayer> layer )
+std::unique_ptr<QgsVectorLayerFeatureSource> QgsVectorLayerUtils::getFeatureSource( QPointer<QgsVectorLayer> layer )
 {
   std::unique_ptr<QgsVectorLayerFeatureSource> featureSource;
 
   auto getFeatureSource = [ layer, &featureSource ]
   {
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 10, 0 )
+    Q_ASSERT( QThread::currentThread() == qApp->thread() );
+#endif
     QgsVectorLayer *lyr = layer.data();
 
     if ( lyr )

diff --git a/src/core/qgsvectorlayerutils.h b/src/core/qgsvectorlayerutils.h
@@ -157,7 +157,7 @@ class CORE_EXPORT QgsVectorLayerUtils
     static QgsFeature duplicateFeature( QgsVectorLayer *layer, const QgsFeature &feature, QgsProject *project, int depth, QgsDuplicateFeatureContext &duplicateFeatureContext SIP_OUT );
 
     /**
-     * Gets the feature source from a weak QgsVectorLayer pointer.
+     * Gets the feature source from a QgsVectorLayer pointer.
      * This method is thread-safe but will block the main thread for execution. Executing it from the main
      * thread is safe too.
      * This should be used in scenarios, where a ``QWeakPointer<QgsVectorLayer>`` is kept in a thread
@@ -166,7 +166,7 @@ class CORE_EXPORT QgsVectorLayerUtils
      * \note Requires Qt >= 5.10 to make use of the thread-safe implementation
      * \since QGIS 3.4
      */
-    static std::unique_ptr<QgsVectorLayerFeatureSource> getFeatureSource( QWeakPointer<QgsVectorLayer> layer ) SIP_SKIP;
+    static std::unique_ptr<QgsVectorLayerFeatureSource> getFeatureSource( QPointer<QgsVectorLayer> layer ) SIP_SKIP;
 };