Fix sip errors

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

Hide file tree

Showing 6 changed files with 14 additions and 24 deletions.
diff --git a/python/core/qgsmaphittest.sip b/python/core/qgsmaphittest.sip
@@ -24,12 +24,12 @@ class QgsMapHitTest
   public:
     typedef QMap<QString, QString> LayerFilterExpression;
 
-    QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const LayerFilterExpression &layerFilterExpression = LayerFilterExpression() );
+    QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const QgsMapHitTest::LayerFilterExpression &layerFilterExpression = QgsMapHitTest::LayerFilterExpression() );
 %Docstring
 \param layerFilterExpression Expression string for each layer id to evaluate in order to refine the symbol selection
 %End
 
-    QgsMapHitTest( const QgsMapSettings &settings, const LayerFilterExpression &layerFilterExpression );
+    QgsMapHitTest( const QgsMapSettings &settings, const QgsMapHitTest::LayerFilterExpression &layerFilterExpression );
 %Docstring
 Constructor version used with only expressions to filter symbols (no extent or polygon intersection)
 %End
@@ -59,16 +59,6 @@ Runs the map hit test
  :rtype: bool
 %End
 
-  protected:
-
-
-
-
-
-
-
-
-
 };
 
 /************************************************************************

diff --git a/python/core/qgsmaprendererjob.sip b/python/core/qgsmaprendererjob.sip
@@ -112,7 +112,7 @@ each LayerRenderJob.
       QString message;
     };
 
-    typedef QList<Error> Errors;
+    typedef QList<QgsMapRendererJob::Error> Errors;
 
     Errors errors() const;
 %Docstring

diff --git a/python/core/qgsmimedatautils.sip b/python/core/qgsmimedatautils.sip
@@ -59,7 +59,7 @@ Identifier of the data source recognized by its providerKey
       QStringList supportedCrs;
       QStringList supportedFormats;
     };
-    typedef QList<Uri> UriList;
+    typedef QList<QgsMimeDataUtils::Uri> UriList;
 
     static QMimeData *encodeUriList( const UriList &layers );
 %Docstring

diff --git a/src/core/qgsmaphittest.h b/src/core/qgsmaphittest.h
@@ -42,10 +42,10 @@ class CORE_EXPORT QgsMapHitTest
     //! \param settings Map settings used to evaluate symbols
     //! \param polygon Polygon geometry to refine the hit test
     //! \param layerFilterExpression Expression string for each layer id to evaluate in order to refine the symbol selection
-    QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const LayerFilterExpression &layerFilterExpression = LayerFilterExpression() );
+    QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const QgsMapHitTest::LayerFilterExpression &layerFilterExpression = QgsMapHitTest::LayerFilterExpression() );
 
     //! Constructor version used with only expressions to filter symbols (no extent or polygon intersection)
-    QgsMapHitTest( const QgsMapSettings &settings, const LayerFilterExpression &layerFilterExpression );
+    QgsMapHitTest( const QgsMapSettings &settings, const QgsMapHitTest::LayerFilterExpression &layerFilterExpression );
 
     //! Runs the map hit test
     void run();
@@ -66,13 +66,13 @@ class CORE_EXPORT QgsMapHitTest
      */
     bool legendKeyVisible( const QString &ruleKey, QgsVectorLayer *layer ) const;
 
-  protected:
+  private:
 
     //! \note not available in Python bindings
-    typedef QSet<QString> SymbolSet SIP_SKIP;
+    typedef QSet<QString> SymbolSet;
 
     //! \note not available in Python bindings
-    typedef QMap<QgsVectorLayer *, SymbolSet> HitTest SIP_SKIP;
+    typedef QMap<QgsVectorLayer *, SymbolSet> HitTest;
 
     /** Runs test for visible symbols within a layer
      * \param vl vector layer
@@ -82,7 +82,7 @@ class CORE_EXPORT QgsMapHitTest
      * \since QGIS 2.12
      * \note not available in Python bindings
      */
-    void runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols, SymbolSet &usedSymbolsRuleKey, QgsRenderContext &context ) SIP_SKIP;
+    void runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols, SymbolSet &usedSymbolsRuleKey, QgsRenderContext &context );
 
     //! The initial map settings
     QgsMapSettings mSettings;
@@ -94,7 +94,7 @@ class CORE_EXPORT QgsMapHitTest
     HitTest mHitTestRuleKey;
 
     //! List of expression filter for each layer
-    LayerFilterExpression mLayerFilterExpression;
+    QgsMapHitTest::LayerFilterExpression mLayerFilterExpression;
 
     //! Polygon used for filtering items. May be empty
     QgsGeometry mPolygon;

diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -177,7 +177,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
       QString message;
     };
 
-    typedef QList<Error> Errors;
+    typedef QList<QgsMapRendererJob::Error> Errors;
 
     //! List of errors that happened during the rendering job - available when the rendering has been finished
     Errors errors() const;

diff --git a/src/core/qgsmimedatautils.h b/src/core/qgsmimedatautils.h
@@ -57,7 +57,7 @@ class CORE_EXPORT QgsMimeDataUtils
       QStringList supportedCrs;
       QStringList supportedFormats;
     };
-    typedef QList<Uri> UriList;
+    typedef QList<QgsMimeDataUtils::Uri> UriList;
 
     static QMimeData *encodeUriList( const UriList &layers );
 
@@ -78,7 +78,7 @@ class CORE_EXPORT QgsMimeDataUtils
 
 };
 
-Q_DECLARE_METATYPE( QgsMimeDataUtils::UriList );
+Q_DECLARE_METATYPE( QgsMimeDataUtils::UriList )
 
 #endif // QGSMIMEDATAUTILS_H