Skip to content

Commit df6d60f

Browse files
committed
Fix sip errors
1 parent 9e059ed commit df6d60f

File tree

6 files changed

+14
-24
lines changed

6 files changed

+14
-24
lines changed

python/core/qgsmaphittest.sip

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ class QgsMapHitTest
2424
public:
2525
typedef QMap<QString, QString> LayerFilterExpression;
2626

27-
QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const LayerFilterExpression &layerFilterExpression = LayerFilterExpression() );
27+
QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const QgsMapHitTest::LayerFilterExpression &layerFilterExpression = QgsMapHitTest::LayerFilterExpression() );
2828
%Docstring
2929
\param layerFilterExpression Expression string for each layer id to evaluate in order to refine the symbol selection
3030
%End
3131

32-
QgsMapHitTest( const QgsMapSettings &settings, const LayerFilterExpression &layerFilterExpression );
32+
QgsMapHitTest( const QgsMapSettings &settings, const QgsMapHitTest::LayerFilterExpression &layerFilterExpression );
3333
%Docstring
3434
Constructor version used with only expressions to filter symbols (no extent or polygon intersection)
3535
%End
@@ -59,16 +59,6 @@ Runs the map hit test
5959
:rtype: bool
6060
%End
6161

62-
protected:
63-
64-
65-
66-
67-
68-
69-
70-
71-
7262
};
7363

7464
/************************************************************************

python/core/qgsmaprendererjob.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ each LayerRenderJob.
112112
QString message;
113113
};
114114

115-
typedef QList<Error> Errors;
115+
typedef QList<QgsMapRendererJob::Error> Errors;
116116

117117
Errors errors() const;
118118
%Docstring

python/core/qgsmimedatautils.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Identifier of the data source recognized by its providerKey
5959
QStringList supportedCrs;
6060
QStringList supportedFormats;
6161
};
62-
typedef QList<Uri> UriList;
62+
typedef QList<QgsMimeDataUtils::Uri> UriList;
6363

6464
static QMimeData *encodeUriList( const UriList &layers );
6565
%Docstring

src/core/qgsmaphittest.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ class CORE_EXPORT QgsMapHitTest
4242
//! \param settings Map settings used to evaluate symbols
4343
//! \param polygon Polygon geometry to refine the hit test
4444
//! \param layerFilterExpression Expression string for each layer id to evaluate in order to refine the symbol selection
45-
QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const LayerFilterExpression &layerFilterExpression = LayerFilterExpression() );
45+
QgsMapHitTest( const QgsMapSettings &settings, const QgsGeometry &polygon = QgsGeometry(), const QgsMapHitTest::LayerFilterExpression &layerFilterExpression = QgsMapHitTest::LayerFilterExpression() );
4646

4747
//! Constructor version used with only expressions to filter symbols (no extent or polygon intersection)
48-
QgsMapHitTest( const QgsMapSettings &settings, const LayerFilterExpression &layerFilterExpression );
48+
QgsMapHitTest( const QgsMapSettings &settings, const QgsMapHitTest::LayerFilterExpression &layerFilterExpression );
4949

5050
//! Runs the map hit test
5151
void run();
@@ -66,13 +66,13 @@ class CORE_EXPORT QgsMapHitTest
6666
*/
6767
bool legendKeyVisible( const QString &ruleKey, QgsVectorLayer *layer ) const;
6868

69-
protected:
69+
private:
7070

7171
//! \note not available in Python bindings
72-
typedef QSet<QString> SymbolSet SIP_SKIP;
72+
typedef QSet<QString> SymbolSet;
7373

7474
//! \note not available in Python bindings
75-
typedef QMap<QgsVectorLayer *, SymbolSet> HitTest SIP_SKIP;
75+
typedef QMap<QgsVectorLayer *, SymbolSet> HitTest;
7676

7777
/** Runs test for visible symbols within a layer
7878
* \param vl vector layer
@@ -82,7 +82,7 @@ class CORE_EXPORT QgsMapHitTest
8282
* \since QGIS 2.12
8383
* \note not available in Python bindings
8484
*/
85-
void runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols, SymbolSet &usedSymbolsRuleKey, QgsRenderContext &context ) SIP_SKIP;
85+
void runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols, SymbolSet &usedSymbolsRuleKey, QgsRenderContext &context );
8686

8787
//! The initial map settings
8888
QgsMapSettings mSettings;
@@ -94,7 +94,7 @@ class CORE_EXPORT QgsMapHitTest
9494
HitTest mHitTestRuleKey;
9595

9696
//! List of expression filter for each layer
97-
LayerFilterExpression mLayerFilterExpression;
97+
QgsMapHitTest::LayerFilterExpression mLayerFilterExpression;
9898

9999
//! Polygon used for filtering items. May be empty
100100
QgsGeometry mPolygon;

src/core/qgsmaprendererjob.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
177177
QString message;
178178
};
179179

180-
typedef QList<Error> Errors;
180+
typedef QList<QgsMapRendererJob::Error> Errors;
181181

182182
//! List of errors that happened during the rendering job - available when the rendering has been finished
183183
Errors errors() const;

src/core/qgsmimedatautils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class CORE_EXPORT QgsMimeDataUtils
5757
QStringList supportedCrs;
5858
QStringList supportedFormats;
5959
};
60-
typedef QList<Uri> UriList;
60+
typedef QList<QgsMimeDataUtils::Uri> UriList;
6161

6262
static QMimeData *encodeUriList( const UriList &layers );
6363

@@ -78,7 +78,7 @@ class CORE_EXPORT QgsMimeDataUtils
7878

7979
};
8080

81-
Q_DECLARE_METATYPE( QgsMimeDataUtils::UriList );
81+
Q_DECLARE_METATYPE( QgsMimeDataUtils::UriList )
8282

8383
#endif // QGSMIMEDATAUTILS_H
8484

0 commit comments

Comments
 (0)