Skip to content
Permalink
Browse files

sip fix for xenial

  • Loading branch information
jef-n committed Oct 4, 2018
1 parent 234985b commit e3e92976339ce68d797c28158087e65a29069bb5
@@ -78,20 +78,20 @@ the Free Software Foundation; either version 2 of the License, or *
{
Change();

Change( ChangeWhat _what, ChangeType _type, QgsVertexId _vidx = QgsVertexId() );
Change( QgsGeometryCheck::ChangeWhat _what, QgsGeometryCheck::ChangeType _type, QgsVertexId _vidx = QgsVertexId() );
%Docstring
Create a new Change
%End

ChangeWhat what;
QgsGeometryCheck::ChangeWhat what;

ChangeType type;
QgsGeometryCheck::ChangeType type;

QgsVertexId vidx;
bool operator==( const Change &other );
bool operator==( const QgsGeometryCheck::Change &other );
};

typedef QMap<QString, QMap<QgsFeatureId, QList<Change> > > Changes;
typedef QMap<QString, QMap<QgsFeatureId, QList<QgsGeometryCheck::Change> > > Changes;

QgsGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
%Docstring
@@ -62,8 +62,8 @@ If useMapCrs was specified, it will already be reprojected into the
CRS specified in the context specified in the constructor.
%End
QString id() const;
bool operator==( const LayerFeature &other ) const;
bool operator!=( const LayerFeature &other ) const;
bool operator==( const QgsGeometryCheckerUtils::LayerFeature &other ) const;
bool operator!=( const QgsGeometryCheckerUtils::LayerFeature &other ) const;

bool useMapCrs() const;
%Docstring
@@ -126,7 +126,7 @@ class ANALYSIS_EXPORT QgsGeometryCheck
/**
* Create a new Change
*/
Change( ChangeWhat _what, ChangeType _type, QgsVertexId _vidx = QgsVertexId() )
Change( QgsGeometryCheck::ChangeWhat _what, QgsGeometryCheck::ChangeType _type, QgsVertexId _vidx = QgsVertexId() )
: what( _what )
, type( _type )
, vidx( _vidx )
@@ -135,18 +135,18 @@ class ANALYSIS_EXPORT QgsGeometryCheck
/**
* What level this change affects.
*/
ChangeWhat what;
QgsGeometryCheck::ChangeWhat what;

/**
* What action this change performs.
*/
ChangeType type;
QgsGeometryCheck::ChangeType type;

/**
* The index of the part / ring / vertex, depending on \see what.
*/
QgsVertexId vidx;
bool operator==( const Change &other )
bool operator==( const QgsGeometryCheck::Change &other )
{
return what == other.what && type == other.type && vidx == other.vidx;
}
@@ -156,7 +156,7 @@ class ANALYSIS_EXPORT QgsGeometryCheck
* A collection of changes.
* Grouped by layer id and feature id.
*/
typedef QMap<QString, QMap<QgsFeatureId, QList<Change> > > Changes;
typedef QMap<QString, QMap<QgsFeatureId, QList<QgsGeometryCheck::Change> > > Changes;

/**
* Create a new geometry check.
@@ -66,8 +66,8 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
*/
const QgsGeometry &geometry() const;
QString id() const;
bool operator==( const LayerFeature &other ) const;
bool operator!=( const LayerFeature &other ) const;
bool operator==( const QgsGeometryCheckerUtils::LayerFeature &other ) const;
bool operator!=( const QgsGeometryCheckerUtils::LayerFeature &other ) const;

/**
* Returns if the geometry is reprojected to the map CRS or not.
@@ -105,7 +105,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
~iterator();
const iterator &operator++();
iterator operator++( int );
const LayerFeature &operator*() const;
const QgsGeometryCheckerUtils::LayerFeature &operator*() const;
bool operator!=( const iterator &other );

private:
@@ -115,7 +115,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
QList<QString>::const_iterator mLayerIt;
QgsFeatureIds::const_iterator mFeatureIt;
const LayerFeatures *mParent = nullptr;
std::unique_ptr<LayerFeature> mCurrentFeature;
std::unique_ptr<QgsGeometryCheckerUtils::LayerFeature> mCurrentFeature;
};

iterator begin() const;

0 comments on commit e3e9297

Please sign in to comment.
You can’t perform that action at this time.