Revert remaining obsolete QVariantList properties

Author: nirvn

src/core/featuremodel.cpp

@@ -126,36 +126,6 @@ void FeatureModel::setFeatures( const QList<QgsFeature> &features )
   endResetModel();
 }
 
-QVariantList FeatureModel::featuresVariant() const
-{
-  QVariantList featuresVariant;
-
-  featuresVariant.reserve( mFeatures.size() );
-  for ( const QgsFeature &feature : mFeatures )
-  {
-    // Pack the custom QgsFeature object into a QVariant safely
-    featuresVariant.append( QVariant::fromValue( feature ) );
-  }
-
-  return featuresVariant;
-}
-
-void FeatureModel::setFeaturesVariant( const QVariantList &features )
-{
-  QList<QgsFeature> featuresList;
-  featuresList.reserve( features.size() );
-
-  for ( const QVariant &variant : features )
-  {
-    if ( variant.canConvert<QgsFeature>() )
-    {
-      featuresList.append( variant.value<QgsFeature>() );
-    }
-  }
-
-  setFeatures( featuresList );
-}
-
 void FeatureModel::setCurrentLayer( QgsVectorLayer *layer )
 {
   if ( layer == mLayer )

src/core/featuremodel.h

@@ -35,7 +35,7 @@ class FeatureModel : public QAbstractListModel
     Q_OBJECT
     Q_PROPERTY( FeatureModel::ModelModes modelMode READ modelMode WRITE setModelMode NOTIFY modelModeChanged )
     Q_PROPERTY( QgsFeature feature READ feature WRITE setFeature NOTIFY featureChanged )
-    Q_PROPERTY( QVariantList features READ featuresVariant WRITE setFeaturesVariant NOTIFY featuresChanged )
+    Q_PROPERTY( QList<QgsFeature> features READ features WRITE setFeatures NOTIFY featuresChanged )
     Q_PROPERTY( QgsFeature linkedParentFeature READ linkedParentFeature WRITE setLinkedParentFeature NOTIFY linkedParentFeatureChanged )
     Q_PROPERTY( QgsRelation linkedRelation READ linkedRelation WRITE setLinkedRelation NOTIFY linkedRelationChanged )
     Q_PROPERTY( QString linkedRelationOrderingField READ linkedRelationOrderingField WRITE setLinkedRelationOrderingField NOTIFY linkedRelationOrderingFieldChanged )
@@ -84,17 +84,10 @@ class FeatureModel : public QAbstractListModel
 
     void setFeature( const QgsFeature &feature );
 
-    /**
-     * Return the feature wrapped in a QVariant for passing it around in QML
-     */
     QgsFeature feature() const;
 
     void setFeatures( const QList<QgsFeature> &features );
 
-    QVariantList featuresVariant() const;
-
-    void setFeaturesVariant( const QVariantList &features );
-
     /**
      * Return the features list for passing it around in QML
      */

src/core/multifeaturelistmodel.cpp

@@ -219,21 +219,6 @@ QList<QgsFeature> MultiFeatureListModel::selectedFeatures()
   return mSourceModel->selectedFeatures();
 }
 
-QVariantList MultiFeatureListModel::selectedFeaturesVariant()
-{
-  QVariantList featuresVariant;
-  const QList<QgsFeature> features = mSourceModel->selectedFeatures();
-
-  featuresVariant.reserve( features.size() );
-  for ( const QgsFeature &feature : features )
-  {
-    // Pack the custom QgsFeature object into a QVariant safely
-    featuresVariant.append( QVariant::fromValue( feature ) );
-  }
-
-  return featuresVariant;
-}
-
 QgsVectorLayer *MultiFeatureListModel::selectedLayer()
 {
   return mFilterLayer.data();

src/core/multifeaturelistmodel.h

@@ -33,7 +33,7 @@ class MultiFeatureListModel : public QSortFilterProxyModel
     Q_OBJECT
 
     Q_PROPERTY( int count READ count NOTIFY countChanged )
-    Q_PROPERTY( QVariantList selectedFeatures READ selectedFeaturesVariant NOTIFY selectedCountChanged )
+    Q_PROPERTY( QList<QgsFeature> selectedFeatures READ selectedFeatures NOTIFY selectedCountChanged )
     Q_PROPERTY( QgsVectorLayer *selectedLayer READ selectedLayer NOTIFY selectedLayerChanged )
     Q_PROPERTY( int selectedCount READ selectedCount NOTIFY selectedCountChanged )
     Q_PROPERTY( bool canEditAttributesSelection READ canEditAttributesSelection NOTIFY selectedCountChanged )
@@ -175,11 +175,6 @@ class MultiFeatureListModel : public QSortFilterProxyModel
      */
     QList<QgsFeature> selectedFeatures();
 
-    /**
-     * Returns the list of currently selected features as a QVariantList object.
-     */
-    QVariantList selectedFeaturesVariant();
-
     /**
      * Returns the vector layer within which one or more features are currently selected
      */

src/core/processing/processingalgorithm.cpp

@@ -91,36 +91,6 @@ void ProcessingAlgorithm::setInPlaceFeatures( const QList<QgsFeature> &features
   }
 }
 
-QVariantList ProcessingAlgorithm::inPlaceFeaturesVariant() const
-{
-  QVariantList featuresVariant;
-
-  featuresVariant.reserve( mInPlaceFeatures.size() );
-  for ( const QgsFeature &feature : mInPlaceFeatures )
-  {
-    // Pack the custom QgsFeature object into a QVariant safely
-    featuresVariant.append( QVariant::fromValue( feature ) );
-  }
-
-  return featuresVariant;
-}
-
-void ProcessingAlgorithm::setInPlaceFeaturesVariant( const QVariantList &features )
-{
-  QList<QgsFeature> featuresList;
-  featuresList.reserve( features.size() );
-
-  for ( const QVariant &variant : features )
-  {
-    if ( variant.canConvert<QgsFeature>() )
-    {
-      featuresList.append( variant.value<QgsFeature>() );
-    }
-  }
-
-  setInPlaceFeatures( featuresList );
-}
-
 void ProcessingAlgorithm::setParameters( const QVariantMap &parameters )
 {
   if ( mAlgorithmParameters == parameters )
@@ -235,7 +205,7 @@ bool ProcessingAlgorithm::run( bool previewMode )
         {
           for ( const QgsFeature &outputFeature : outputFeatures )
           {
-            mPreviewGeometries << QVariant::fromValue( outputFeature.geometry() );
+            mPreviewGeometries << outputFeature.geometry();
           }
 
           emit previewGeometriesChanged();
@@ -326,7 +296,7 @@ bool ProcessingAlgorithm::run( bool previewMode )
           {
             for ( const QgsFeature &previewFeature : outputFeatures )
             {
-              mPreviewGeometries << QVariant::fromValue( previewFeature.geometry() );
+              mPreviewGeometries << previewFeature.geometry();
             }
 
             emit previewGeometriesChanged();

src/core/processing/processingalgorithm.h

@@ -45,10 +45,10 @@ class ProcessingAlgorithm : public QObject
 
     Q_PROPERTY( QVariantMap parameters READ parameters WRITE setParameters NOTIFY parametersChanged )
     Q_PROPERTY( QgsVectorLayer *inPlaceLayer READ inPlaceLayer WRITE setInPlaceLayer NOTIFY inPlaceLayerChanged )
-    Q_PROPERTY( QVariantList inPlaceFeatures READ inPlaceFeaturesVariant WRITE setInPlaceFeaturesVariant NOTIFY inPlaceFeaturesChanged )
+    Q_PROPERTY( QList<QgsFeature> inPlaceFeatures READ inPlaceFeatures WRITE setInPlaceFeatures NOTIFY inPlaceFeaturesChanged )
 
     Q_PROPERTY( bool preview READ preview WRITE setPreview NOTIFY previewChanged )
-    Q_PROPERTY( QVariantList previewGeometries READ previewGeometries NOTIFY previewGeometriesChanged )
+    Q_PROPERTY( QList<QgsGeometry> previewGeometries READ previewGeometries NOTIFY previewGeometriesChanged )
 
   public:
     explicit ProcessingAlgorithm( QObject *parent = nullptr );
@@ -98,16 +98,6 @@ class ProcessingAlgorithm : public QObject
      */
     void setInPlaceFeatures( const QList<QgsFeature> &features );
 
-    /**
-     * Returns the vector \a layer for in-place algorithm filter as a QVariantList.
-     */
-    QVariantList inPlaceFeaturesVariant() const;
-
-    /**
-     * Sets the vector \a layer for in-place algorithm filter from a QVariantList.
-     */
-    void setInPlaceFeaturesVariant( const QVariantList &features );
-
     /**
      * Returns the algorithm parameters as a map of parameter names as keys and values.
      */
@@ -133,7 +123,7 @@ class ProcessingAlgorithm : public QObject
     /**
      * Returns a list of geometries previewing the algorithm result using current parameters.
      */
-    QVariantList previewGeometries() const { return mPreviewGeometries; }
+    QList<QgsGeometry> previewGeometries() const { return mPreviewGeometries; }
 
     /**
      * Executes the algorithm.
@@ -180,7 +170,7 @@ class ProcessingAlgorithm : public QObject
     QList<QgsFeature> mInPlaceFeatures;
 
     bool mPreview = false;
-    QVariantList mPreviewGeometries;
+    QList<QgsGeometry> mPreviewGeometries;
 };
 
 #endif // PROCESSINGALGORITHM

src/core/trackingmodel.cpp

@@ -102,22 +102,6 @@ bool TrackingModel::featureInTracking( QgsVectorLayer *layer, const QgsFeatureId
   return false;
 }
 
-bool TrackingModel::featuresInTracking( QgsVectorLayer *layer, const QVariantList &features )
-{
-  QList<QgsFeature> featuresList;
-
-  featuresList.reserve( features.size() );
-  for ( const QVariant &variant : features )
-  {
-    if ( variant.canConvert<QgsFeature>() )
-    {
-      featuresList.append( variant.value<QgsFeature>() );
-    }
-  }
-
-  return featuresInTracking( layer, featuresList );
-}
-
 bool TrackingModel::featuresInTracking( QgsVectorLayer *layer, const QList<QgsFeature> &features )
 {
   auto it = trackerIterator( layer );

src/core/trackingmodel.h

@@ -64,9 +64,7 @@ class TrackingModel : public QAbstractItemModel
     //! Returns TRUE if the \a featureId is attached to a vector \a layer tracking session.
     Q_INVOKABLE bool featureInTracking( QgsVectorLayer *layer, QgsFeatureId featureId );
     //! Returns TRUE if the list of \a features is attached to a vector \a layer tracking session.
-    Q_INVOKABLE bool featuresInTracking( QgsVectorLayer *layer, const QVariantList &features );
-    //! Returns TRUE if the list of \a features is attached to a vector \a layer tracking session.
-    bool featuresInTracking( QgsVectorLayer *layer, const QList<QgsFeature> &features );
+    Q_INVOKABLE bool featuresInTracking( QgsVectorLayer *layer, const QList<QgsFeature> &features );
     //! Returns TRUE if the vector \a layer has a tracking session.
     Q_INVOKABLE bool layerInTracking( QgsVectorLayer *layer ) const;
     //! Returns TRUE if the vector \a layer has an active tracking session.