Skip to content
Permalink
Browse files
Fix sip errors
  • Loading branch information
m-kuhn committed May 15, 2017
1 parent 9e059ed commit df6d60fcc18da1fcc80b36c12517063d17110837
@@ -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:









};

/************************************************************************
@@ -112,7 +112,7 @@ each LayerRenderJob.
QString message;
};

typedef QList<Error> Errors;
typedef QList<QgsMapRendererJob::Error> Errors;

Errors errors() const;
%Docstring
@@ -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
@@ -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;
@@ -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;
@@ -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

0 comments on commit df6d60f

Please sign in to comment.