Skip to content

Commit

Permalink
fix missing overrides warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Sep 26, 2015
1 parent ddecc6f commit ab17869
Show file tree
Hide file tree
Showing 14 changed files with 67 additions and 67 deletions.
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryanglecheck.h
View file
Expand Up @@ -17,11 +17,11 @@ class QgsGeometryAngleCheck : public QgsGeometryCheck
public:
QgsGeometryAngleCheck( QgsFeaturePool* featurePool, double minAngle )
: QgsGeometryCheck( FeatureNodeCheck, featurePool ), mMinAngle( minAngle ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Minimal angle" ); }
QString errorName() const { return "QgsGeometryAngleCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Minimal angle" ); }
QString errorName() const override { return "QgsGeometryAngleCheck"; }
private:
enum ResolutionMethod { DeleteNode, NoChange };
double mMinAngle;
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryareacheck.h
View file
Expand Up @@ -19,11 +19,11 @@ class QgsGeometryAreaCheck : public QgsGeometryCheck
public:
QgsGeometryAreaCheck( QgsFeaturePool* featurePool, double threshold )
: QgsGeometryCheck( FeatureCheck, featurePool ), mThreshold( threshold ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Minimal area" ); }
QString errorName() const { return "QgsGeometryAreaCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Minimal area" ); }
QString errorName() const override { return "QgsGeometryAreaCheck"; }
private:
enum ResolutionMethod { MergeLongestEdge, MergeLargestArea, MergeIdenticalAttribute, Delete, NoChange };

Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h
View file
Expand Up @@ -40,11 +40,11 @@ class QgsGeometryContainedCheck : public QgsGeometryCheck

public:
QgsGeometryContainedCheck( QgsFeaturePool* featurePool ) : QgsGeometryCheck( FeatureCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Within" ); }
QString errorName() const { return "QgsGeometryContainedCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Within" ); }
QString errorName() const override { return "QgsGeometryContainedCheck"; }
private:
enum ResolutionMethod { Delete, NoChange };
};
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometrydegeneratepolygoncheck.h
View file
Expand Up @@ -17,11 +17,11 @@ class QgsGeometryDegeneratePolygonCheck : public QgsGeometryCheck
public:
QgsGeometryDegeneratePolygonCheck( QgsFeaturePool* featurePool )
: QgsGeometryCheck( FeatureNodeCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Polygon with less than three nodes" ); }
QString errorName() const { return "QgsGeometryDegeneratePolygonCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Polygon with less than three nodes" ); }
QString errorName() const override { return "QgsGeometryDegeneratePolygonCheck"; }

private:
enum ResolutionMethod { DeleteRing, NoChange };
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.h
View file
Expand Up @@ -49,11 +49,11 @@ class QgsGeometryDuplicateCheck : public QgsGeometryCheck
public:
QgsGeometryDuplicateCheck( QgsFeaturePool* featurePool )
: QgsGeometryCheck( FeatureCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Duplicate" ); }
QString errorName() const { return "QgsGeometryDuplicateCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Duplicate" ); }
QString errorName() const override { return "QgsGeometryDuplicateCheck"; }

private:
enum ResolutionMethod { NoChange, RemoveDuplicates };
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryduplicatenodescheck.h
View file
Expand Up @@ -17,11 +17,11 @@ class QgsGeometryDuplicateNodesCheck : public QgsGeometryCheck
public:
QgsGeometryDuplicateNodesCheck( QgsFeaturePool* featurePool )
: QgsGeometryCheck( FeatureNodeCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Duplicate node" ); }
QString errorName() const { return "QgsGeometryDuplicateNodesCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Duplicate node" ); }
QString errorName() const override { return "QgsGeometryDuplicateNodesCheck"; }

private:
enum ResolutionMethod { RemoveDuplicates, NoChange };
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h
View file
Expand Up @@ -79,11 +79,11 @@ class QgsGeometryGapCheck : public QgsGeometryCheck
public:
QgsGeometryGapCheck( QgsFeaturePool* featurePool, double threshold )
: QgsGeometryCheck( LayerCheck, featurePool ), mThreshold( threshold ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Gap" ); }
QString errorName() const { return "QgsGeometryGapCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Gap" ); }
QString errorName() const override { return "QgsGeometryGapCheck"; }

private:
enum ResolutionMethod { MergeLongestEdge, NoChange };
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryholecheck.h
View file
Expand Up @@ -17,11 +17,11 @@ class QgsGeometryHoleCheck : public QgsGeometryCheck
public:
QgsGeometryHoleCheck( QgsFeaturePool* featurePool )
: QgsGeometryCheck( FeatureCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Polygon with hole" ); }
QString errorName() const { return "QgsGeometryHoleCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Polygon with hole" ); }
QString errorName() const override { return "QgsGeometryHoleCheck"; }
private:
enum ResolutionMethod { RemoveHoles, NoChange };
};
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometrymultipartcheck.h
View file
Expand Up @@ -17,11 +17,11 @@ class QgsGeometryMultipartCheck : public QgsGeometryCheck
public:
QgsGeometryMultipartCheck( QgsFeaturePool* featurePool )
: QgsGeometryCheck( FeatureCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Multipart object with only one feature" ); }
QString errorName() const { return "QgsGeometryMultipartCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Multipart object with only one feature" ); }
QString errorName() const override { return "QgsGeometryMultipartCheck"; }
private:
enum ResolutionMethod { ConvertToSingle, RemoveObject, NoChange };
};
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.h
View file
Expand Up @@ -50,11 +50,11 @@ class QgsGeometryOverlapCheck : public QgsGeometryCheck
public:
QgsGeometryOverlapCheck( QgsFeaturePool* featurePool, double threshold )
: QgsGeometryCheck( FeatureCheck, featurePool ), mThreshold( threshold ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Overlap" ); }
QString errorName() const { return "QgsGeometryOverlapCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Overlap" ); }
QString errorName() const override { return "QgsGeometryOverlapCheck"; }
private:
enum ResolutionMethod { Subtract, NoChange };
double mThreshold;
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.h
View file
Expand Up @@ -17,11 +17,11 @@ class QgsGeometrySegmentLengthCheck : public QgsGeometryCheck
public:
QgsGeometrySegmentLengthCheck( QgsFeaturePool* featurePool, double minLength )
: QgsGeometryCheck( FeatureNodeCheck, featurePool ), mMinLength( minLength ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Minimal segment length" ); }
QString errorName() const { return "QgsGeometrySegmentLengthCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Minimal segment length" ); }
QString errorName() const override { return "QgsGeometrySegmentLengthCheck"; }
private:
enum ResolutionMethod { NoChange };
double mMinLength;
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.h
View file
Expand Up @@ -42,11 +42,11 @@ class QgsGeometrySelfIntersectionCheck : public QgsGeometryCheck
public:
QgsGeometrySelfIntersectionCheck( QgsFeaturePool* featurePool )
: QgsGeometryCheck( FeatureNodeCheck, featurePool ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Self intersection" ); }
QString errorName() const { return "QgsGeometrySelfIntersectionCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Self intersection" ); }
QString errorName() const override { return "QgsGeometrySelfIntersectionCheck"; }
private:
enum ResolutionMethod { ToMultiObject, ToSingleObjects, NoChange };
};
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/geometry_checker/checks/qgsgeometrysliverpolygoncheck.h
View file
Expand Up @@ -18,8 +18,8 @@ class QgsGeometrySliverPolygonCheck : public QgsGeometryAreaCheck
public:
QgsGeometrySliverPolygonCheck( QgsFeaturePool* featurePool, double threshold, double maxArea = 0. )
: QgsGeometryAreaCheck( featurePool, threshold ), mMaxArea( maxArea ) {}
QString errorDescription() const { return tr( "Sliver polygon" ); }
QString errorName() const { return "QgsGeometrySliverPolygonCheck"; }
QString errorDescription() const override { return tr( "Sliver polygon" ); }
QString errorName() const override { return "QgsGeometrySliverPolygonCheck"; }

private:
double mMaxArea;
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/geometry_checker/checks/qgsgeometrytypecheck.h
View file
Expand Up @@ -41,11 +41,11 @@ class QgsGeometryTypeCheck : public QgsGeometryCheck
public:
QgsGeometryTypeCheck( QgsFeaturePool* featurePool, int allowedTypes )
: QgsGeometryCheck( FeatureCheck, featurePool ), mAllowedTypes( allowedTypes ) {}
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const;
const QStringList& getResolutionMethods() const;
QString errorDescription() const { return tr( "Geometry type" ); }
QString errorName() const { return "QgsGeometryTypeCheck"; }
void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = 0, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
const QStringList& getResolutionMethods() const override;
QString errorDescription() const override { return tr( "Geometry type" ); }
QString errorName() const override { return "QgsGeometryTypeCheck"; }
private:
enum ResolutionMethod { Convert, Delete, NoChange };
int mAllowedTypes;
Expand Down

0 comments on commit ab17869

Please sign in to comment.