Fix sip errors

qgis · May 15, 2017 · 9e059ed · 9e059ed
1 parent 6ad5a58
commit 9e059ed
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/python/core/qgsdataitemproviderregistry.sip b/python/core/qgsdataitemproviderregistry.sip
@@ -48,6 +48,8 @@ Add a provider implementation. Takes ownership of the object.
 Remove provider implementation from the list (provider object is deleted)
 %End
 
+  private:
+    QgsDataItemProviderRegistry( const QgsDataItemProviderRegistry &rh );
 };
 
 /************************************************************************

diff --git a/python/core/qgsexpressionfieldbuffer.sip b/python/core/qgsexpressionfieldbuffer.sip
@@ -84,9 +84,9 @@ class QgsExpressionFieldBuffer
  \param flds The fields to be updated
 %End
 
-    QList<ExpressionField> expressions() const;
+    QList<QgsExpressionFieldBuffer::ExpressionField> expressions() const;
 %Docstring
- :rtype: list of ExpressionField
+ :rtype: list of QgsExpressionFieldBuffer.ExpressionField
 %End
 
 };

diff --git a/src/core/qgsdataitemproviderregistry.h b/src/core/qgsdataitemproviderregistry.h
@@ -55,6 +55,9 @@ class CORE_EXPORT QgsDataItemProviderRegistry
     void removeProvider( QgsDataItemProvider *provider );
 
   private:
+#ifdef SIP_RUN
+    QgsDataItemProviderRegistry( const QgsDataItemProviderRegistry &rh );
+#endif
 
     //! available providers. this class owns the pointers
     QList<QgsDataItemProvider *> mProviders;

diff --git a/src/core/qgsexpressionfieldbuffer.h b/src/core/qgsexpressionfieldbuffer.h
@@ -99,7 +99,7 @@ class CORE_EXPORT QgsExpressionFieldBuffer
      */
     void updateFields( QgsFields &flds );
 
-    QList<ExpressionField> expressions() const { return mExpressions; }
+    QList<QgsExpressionFieldBuffer::ExpressionField> expressions() const { return mExpressions; }
 
   private:
     QList<ExpressionField> mExpressions;