Use correct layer comparators when comparing layer sources in processing

Fixes #37394
qgis · Jul 6, 2020 · 398b55e · 398b55e
1 parent fe9f7e1
commit 398b55e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/core/auto_generated/processing/qgsprocessingparameters.sip.in b/python/core/auto_generated/processing/qgsprocessingparameters.sip.in
@@ -95,9 +95,9 @@ You can use QgsXmlUtils.readVariant to load it from an XML document.
 .. versionadded:: 3.14
 %End
 
-    bool operator==( const QgsProcessingFeatureSourceDefinition &other );
+    bool operator==( const QgsProcessingFeatureSourceDefinition &other ) const;
 
-    bool operator!=( const QgsProcessingFeatureSourceDefinition &other );
+    bool operator!=( const QgsProcessingFeatureSourceDefinition &other ) const;
 
     operator QVariant() const;
 

diff --git a/src/core/processing/qgsprocessingparameters.h b/src/core/processing/qgsprocessingparameters.h
@@ -162,7 +162,7 @@ class CORE_EXPORT QgsProcessingFeatureSourceDefinition
      */
     bool loadVariant( const QVariantMap &map );
 
-    bool operator==( const QgsProcessingFeatureSourceDefinition &other )
+    bool operator==( const QgsProcessingFeatureSourceDefinition &other ) const
     {
       return source == other.source
              && selectedFeaturesOnly == other.selectedFeaturesOnly
@@ -171,7 +171,7 @@ class CORE_EXPORT QgsProcessingFeatureSourceDefinition
              && geometryCheck == other.geometryCheck;
     }
 
-    bool operator!=( const QgsProcessingFeatureSourceDefinition &other )
+    bool operator!=( const QgsProcessingFeatureSourceDefinition &other ) const
     {
       return !( *this == other );
     }

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -236,6 +236,8 @@ void QgsApplication::init( QString profileFolder )
   qRegisterMetaType<QgsRemappingSinkDefinition>( "QgsRemappingSinkDefinition" );
   qRegisterMetaType<QgsProcessingModelChildDependency>( "QgsProcessingModelChildDependency" );
   QMetaType::registerComparators<QgsProcessingModelChildDependency>();
+  QMetaType::registerEqualsComparator<QgsProcessingFeatureSourceDefinition>();
+  QMetaType::registerEqualsComparator<QgsProperty>();
 
   ( void ) resolvePkgPath();