Fix rebase issues

qgis · Oct 15, 2018 · 38b2f71d7addb0dd3825aab81664205dc66d5e86 · 38b2f71
1 parent c6159bf
commit 38b2f71d7addb0dd3825aab81664205dc66d5e86
Unified Split

Showing with 6 additions and 31 deletions.

+2 −8 src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h

+1 −3 src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp

+3 −20 src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h
@@ -76,6 +76,8 @@ class ANALYSIS_EXPORT QgsGeometryGapCheckError : public QgsGeometryCheckError
 class ANALYSIS_EXPORT QgsGeometryGapCheck : public QgsGeometryCheck
 {
   public:
+    enum ResolutionMethod { MergeLongestEdge, NoChange };
+
     explicit QgsGeometryGapCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
 
     QList<QgsWkbTypes::GeometryType> compatibleGeometryTypes() const override { return factoryCompatibleGeometryTypes(); }
@@ -97,14 +99,6 @@ class ANALYSIS_EXPORT QgsGeometryGapCheck : public QgsGeometryCheck
     static QgsGeometryCheck::CheckType factoryCheckType() SIP_SKIP;
 ///@endcond private
 
-    static QString factoryDescription() { return tr( "Gap" ); }
-    static QString factoryId() { return QStringLiteral( "QgsGeometryGapCheck" ); }
-    static QgsGeometryCheck::Flags factoryFlags() {return QgsGeometryCheck::SingleLayerTopologyCheck;}
-    static QList<QgsWkbTypes::GeometryType> factoryCompatibleGeometryTypes() {return {QgsWkbTypes::PolygonGeometry};}
-    static bool factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP { return factoryCompatibleGeometryTypes().contains( layer->geometryType() ); }
-
-    enum ResolutionMethod { MergeLongestEdge, NoChange };
-
   private:
     bool mergeWithNeighbor( const QMap<QString, QgsFeaturePool *> &featurePools,
                             QgsGeometryGapCheckError *err, Changes &changes, QString &errMsg ) const;

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp
@@ -27,9 +27,7 @@
 QgsGeometryMissingVertexCheck::QgsGeometryMissingVertexCheck( const QgsGeometryCheckContext *context, const QVariantMap &geometryCheckConfiguration )
   : QgsGeometryCheck( context, geometryCheckConfiguration )
 
-{
-
-}
+{}
 
 void QgsGeometryMissingVertexCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
@@ -72,6 +72,9 @@ class ANALYSIS_EXPORT QgsGeometryOverlapCheckError : public QgsGeometryCheckErro
 class ANALYSIS_EXPORT QgsGeometryOverlapCheck : public QgsGeometryCheck
 {
   public:
+
+    enum ResolutionMethod { Subtract, NoChange };
+
     QgsGeometryOverlapCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
     QList<QgsWkbTypes::GeometryType> compatibleGeometryTypes() const override { return factoryCompatibleGeometryTypes(); }
     void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback = nullptr, const LayerFeatureIds &ids = LayerFeatureIds() ) const override;
@@ -92,26 +95,6 @@ class ANALYSIS_EXPORT QgsGeometryOverlapCheck : public QgsGeometryCheck
     static QgsGeometryCheck::CheckType factoryCheckType() SIP_SKIP;
 ///@endcond private
 
-    static QString factoryDescription() { return tr( "Overlap" ); }
-    static QString factoryId() { return QStringLiteral( "QgsGeometryOverlapCheck" ); }
-    static QgsGeometryCheck::Flags factoryFlags() {return QgsGeometryCheck::SingleLayerTopologyCheck;}
-    static QList<QgsWkbTypes::GeometryType> factoryCompatibleGeometryTypes() {return {QgsWkbTypes::PolygonGeometry};}
-    static bool factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP { return factoryCompatibleGeometryTypes().contains( layer->geometryType() ); }
-
-    QString description() const override;
-    QString id() const override;
-    QgsGeometryCheck::Flags flags() const override;
-
-///@cond private
-    static QString factoryDescription() SIP_SKIP;
-    static QString factoryId() SIP_SKIP;
-    static QgsGeometryCheck::Flags factoryFlags() SIP_SKIP;
-    static QList<QgsWkbTypes::GeometryType> factoryCompatibleGeometryTypes() SIP_SKIP;
-    static bool factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP;
-///@endcond private
-
-    enum ResolutionMethod { Subtract, NoChange };
-
   private:
     const double mOverlapThresholdMapUnits;