Make travis even happier

This commit is contained in:
Matthias Kuhn 2018-12-22 16:38:32 +01:00
parent cb766d7f72
commit b87798cd8f
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
9 changed files with 19 additions and 12 deletions

View File

@ -51,7 +51,7 @@ This represents an error reported by a geometry check.
ValueType valueType = ValueOther ); ValueType valueType = ValueOther );
%Docstring %Docstring
Create a new geometry check error with the parent ``check`` and for the Create a new geometry check error with the parent ``check`` and for the
``layerFeature`` pair at the \errorLocation. Optionally the vertex can be ``layerFeature`` pair at the ``errorLocation``. Optionally the vertex can be
specified via ``vixd`` and a ``value`` with its ``value`` Type for specified via ``vixd`` and a ``value`` with its ``value`` Type for
additional information. additional information.
%End %End
@ -157,7 +157,7 @@ If this returns true, it can be used to update existing errors after re-checking
virtual void update( const QgsGeometryCheckError *other ); virtual void update( const QgsGeometryCheckError *other );
%Docstring %Docstring
Update this error with the information from \other. Update this error with the information from ``other``.
Will be used to update existing errors whenever they are re-checked. Will be used to update existing errors whenever they are re-checked.
%End %End

View File

@ -38,7 +38,7 @@ Creates a new single geometry check error.
virtual void update( const QgsSingleGeometryCheckError *other ); virtual void update( const QgsSingleGeometryCheckError *other );
%Docstring %Docstring
Update this error with the information from \other. Update this error with the information from ``other``.
Will be used to update existing errors whenever they are re-checked. Will be used to update existing errors whenever they are re-checked.
%End %End

View File

@ -59,7 +59,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
/** /**
* Create a new geometry check error with the parent \a check and for the * Create a new geometry check error with the parent \a check and for the
* \a layerFeature pair at the \errorLocation. Optionally the vertex can be * \a layerFeature pair at the \a errorLocation. Optionally the vertex can be
* specified via \a vixd and a \a value with its \a value Type for * specified via \a vixd and a \a value with its \a value Type for
* additional information. * additional information.
*/ */
@ -169,7 +169,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
virtual bool closeMatch( QgsGeometryCheckError * /*other*/ ) const; virtual bool closeMatch( QgsGeometryCheckError * /*other*/ ) const;
/** /**
* Update this error with the information from \other. * Update this error with the information from \a other.
* Will be used to update existing errors whenever they are re-checked. * Will be used to update existing errors whenever they are re-checked.
*/ */
virtual void update( const QgsGeometryCheckError *other ); virtual void update( const QgsGeometryCheckError *other );

View File

@ -221,7 +221,6 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
/** /**
* Returns the number of points in a polyline, accounting for duplicate start and end point if the polyline is closed * Returns the number of points in a polyline, accounting for duplicate start and end point if the polyline is closed
* \param polyLine The polyline
* \returns The number of distinct points of the polyline * \returns The number of distinct points of the polyline
*/ */
static inline int polyLineSize( const QgsAbstractGeometry *geom, int iPart, int iRing, bool *isClosed = nullptr ) static inline int polyLineSize( const QgsAbstractGeometry *geom, int iPart, int iRing, bool *isClosed = nullptr )

View File

@ -256,6 +256,7 @@ QgsGeometryCheck::Flags QgsGeometryGapCheck::flags() const
return factoryFlags(); return factoryFlags();
} }
///@cond private
QString QgsGeometryGapCheck::factoryDescription() QString QgsGeometryGapCheck::factoryDescription()
{ {
return tr( "Gap" ); return tr( "Gap" );
@ -285,3 +286,4 @@ QgsGeometryCheck::CheckType QgsGeometryGapCheck::factoryCheckType()
{ {
return QgsGeometryCheck::LayerCheck; return QgsGeometryCheck::LayerCheck;
} }
///@endcond private

View File

@ -210,6 +210,7 @@ QList<QgsWkbTypes::GeometryType> QgsGeometryMissingVertexCheck::factoryCompatibl
return {QgsWkbTypes::PolygonGeometry}; return {QgsWkbTypes::PolygonGeometry};
} }
///@cond private
bool QgsGeometryMissingVertexCheck::factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP bool QgsGeometryMissingVertexCheck::factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP
{ {
return factoryCompatibleGeometryTypes().contains( layer->geometryType() ); return factoryCompatibleGeometryTypes().contains( layer->geometryType() );
@ -234,3 +235,4 @@ QgsGeometryCheck::CheckType QgsGeometryMissingVertexCheck::factoryCheckType()
{ {
return QgsGeometryCheck::LayerCheck; return QgsGeometryCheck::LayerCheck;
} }
///@endcond private

View File

@ -227,6 +227,12 @@ QString QgsGeometryOverlapCheck::factoryDescription()
return tr( "Overlap" ); return tr( "Overlap" );
} }
///@cond private
QgsGeometryCheck::CheckType QgsGeometryOverlapCheck::factoryCheckType()
{
return QgsGeometryCheck::LayerCheck;
}
QString QgsGeometryOverlapCheck::factoryId() QString QgsGeometryOverlapCheck::factoryId()
{ {
return QStringLiteral( "QgsGeometryOverlapCheck" ); return QStringLiteral( "QgsGeometryOverlapCheck" );
@ -247,6 +253,7 @@ bool QgsGeometryOverlapCheck::factoryIsCompatible( QgsVectorLayer *layer ) SIP_S
return factoryCompatibleGeometryTypes().contains( layer->geometryType() ); return factoryCompatibleGeometryTypes().contains( layer->geometryType() );
} }
///@endcond private
QgsGeometryOverlapCheckError::QgsGeometryOverlapCheckError( const QgsGeometryCheck *check, const QgsGeometryCheckerUtils::LayerFeature &layerFeature, const QgsGeometry &geometry, const QgsPointXY &errorLocation, const QVariant &value, const QgsGeometryCheckerUtils::LayerFeature &overlappedFeature ) QgsGeometryOverlapCheckError::QgsGeometryOverlapCheckError( const QgsGeometryCheck *check, const QgsGeometryCheckerUtils::LayerFeature &layerFeature, const QgsGeometry &geometry, const QgsPointXY &errorLocation, const QVariant &value, const QgsGeometryCheckerUtils::LayerFeature &overlappedFeature )
: QgsGeometryCheckError( check, layerFeature.layer()->id(), layerFeature.feature().id(), geometry, errorLocation, QgsVertexId(), value, ValueArea ) : QgsGeometryCheckError( check, layerFeature.layer()->id(), layerFeature.feature().id(), geometry, errorLocation, QgsVertexId(), value, ValueArea )
, mOverlappedFeature( OverlappedFeature( overlappedFeature.layer(), overlappedFeature.feature().id() ) ) , mOverlappedFeature( OverlappedFeature( overlappedFeature.layer(), overlappedFeature.feature().id() ) )
@ -258,8 +265,3 @@ QString QgsGeometryOverlapCheckError::description() const
{ {
return QCoreApplication::translate( "QgsGeometryTypeCheckError", "Overlap with %1 at feature %2" ).arg( mOverlappedFeature.layerName(), QString::number( mOverlappedFeature.featureId() ) ); return QCoreApplication::translate( "QgsGeometryTypeCheckError", "Overlap with %1 at feature %2" ).arg( mOverlappedFeature.layerName(), QString::number( mOverlappedFeature.featureId() ) );
} }
QgsGeometryCheck::CheckType QgsGeometryOverlapCheck::factoryCheckType()
{
return QgsGeometryCheck::LayerCheck;
}

View File

@ -333,6 +333,7 @@ QList<QgsSingleGeometryCheckError *> QgsGeometrySelfIntersectionCheck::processGe
return errors; return errors;
} }
///@cond private
QList<QgsWkbTypes::GeometryType> QgsGeometrySelfIntersectionCheck::factoryCompatibleGeometryTypes() QList<QgsWkbTypes::GeometryType> QgsGeometrySelfIntersectionCheck::factoryCompatibleGeometryTypes()
{ {
return {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}; return {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry};
@ -362,3 +363,4 @@ QgsGeometryCheck::CheckType QgsGeometrySelfIntersectionCheck::factoryCheckType()
{ {
return QgsGeometryCheck::FeatureNodeCheck; return QgsGeometryCheck::FeatureNodeCheck;
} }
///@endcond private

View File

@ -53,7 +53,7 @@ class ANALYSIS_EXPORT QgsSingleGeometryCheckError
virtual ~QgsSingleGeometryCheckError() = default; virtual ~QgsSingleGeometryCheckError() = default;
/** /**
* Update this error with the information from \other. * Update this error with the information from \a other.
* Will be used to update existing errors whenever they are re-checked. * Will be used to update existing errors whenever they are re-checked.
*/ */
virtual void update( const QgsSingleGeometryCheckError *other ); virtual void update( const QgsSingleGeometryCheckError *other );