Skip to content

Commit

Permalink
Remvoe Q_OBJECT macro from geometry checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-kuhn
m-kuhn committed Aug 18, 2018
1 parent 9c0e742 commit 37d0b7b
Show file tree
Hide file tree
Showing 25 changed files with 32 additions and 73 deletions.
47 changes: 24 additions & 23 deletions src/analysis/CMakeLists.txt
View file
Expand Up @@ -171,29 +171,6 @@ SET(QGIS_ANALYSIS_MOC_HDRS

vector/geometry_checker/qgsfeaturepool.h
vector/geometry_checker/qgsgeometrychecker.h
vector/geometry_checker/qgsgeometryanglecheck.h
vector/geometry_checker/qgsgeometryareacheck.h
vector/geometry_checker/qgsgeometrychecker.h
vector/geometry_checker/qgsgeometrycheck.h
vector/geometry_checker/qgsgeometrycontainedcheck.h
vector/geometry_checker/qgsgeometrydanglecheck.h
vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
vector/geometry_checker/qgsgeometryduplicatecheck.h
vector/geometry_checker/qgsgeometryduplicatenodescheck.h
vector/geometry_checker/qgsgeometryfollowboundariescheck.h
vector/geometry_checker/qgsgeometrygapcheck.h
vector/geometry_checker/qgsgeometryholecheck.h
vector/geometry_checker/qgsgeometrylineintersectioncheck.h
vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
vector/geometry_checker/qgsgeometrymultipartcheck.h
vector/geometry_checker/qgsgeometryoverlapcheck.h
vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
vector/geometry_checker/qgsgeometryselfcontactcheck.h
vector/geometry_checker/qgsgeometryselfintersectioncheck.h
vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
vector/geometry_checker/qgsgeometrytypecheck.h
)

INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})
Expand Down Expand Up @@ -281,6 +258,30 @@ SET(QGIS_ANALYSIS_HDRS
network/qgsnetworkdistancestrategy.h
network/qgsgraphanalyzer.h
network/qgsvectorlayerdirector.h

vector/geometry_checker/qgsgeometryanglecheck.h
vector/geometry_checker/qgsgeometryareacheck.h
vector/geometry_checker/qgsgeometrychecker.h
vector/geometry_checker/qgsgeometrycheck.h
vector/geometry_checker/qgsgeometrycontainedcheck.h
vector/geometry_checker/qgsgeometrydanglecheck.h
vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
vector/geometry_checker/qgsgeometryduplicatecheck.h
vector/geometry_checker/qgsgeometryduplicatenodescheck.h
vector/geometry_checker/qgsgeometryfollowboundariescheck.h
vector/geometry_checker/qgsgeometrygapcheck.h
vector/geometry_checker/qgsgeometryholecheck.h
vector/geometry_checker/qgsgeometrylineintersectioncheck.h
vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
vector/geometry_checker/qgsgeometrymultipartcheck.h
vector/geometry_checker/qgsgeometryoverlapcheck.h
vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
vector/geometry_checker/qgsgeometryselfcontactcheck.h
vector/geometry_checker/qgsgeometryselfintersectioncheck.h
vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
vector/geometry_checker/qgsgeometrytypecheck.h
)

INCLUDE_DIRECTORIES(
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryanglecheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryAngleCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryAngleCheck( QgsGeometryCheckerContext *context, double minAngle )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryareacheck.h
View file
Expand Up @@ -24,8 +24,6 @@ class QgsSurface;

class ANALYSIS_EXPORT QgsGeometryAreaCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryAreaCheck( QgsGeometryCheckerContext *context, double thresholdMapUnits )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PolygonGeometry}, context )
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
View file
Expand Up @@ -47,7 +47,7 @@ namespace QgsGeometryCheckerUtils

/////////////////////////////////////////////////////////////////////////////

LayerFeatures::iterator::iterator( const QList<QString>::iterator &layerIt, LayerFeatures *parent )
LayerFeatures::iterator::iterator( const QStringList::const_iterator &layerIt, const LayerFeatures *parent )
: mLayerIt( layerIt )
, mFeatureIt( QgsFeatureIds::const_iterator() )
, mParent( parent )
Expand Down
12 changes: 6 additions & 6 deletions src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
View file
Expand Up @@ -66,7 +66,7 @@ namespace QgsGeometryCheckerUtils
class iterator
{
public:
iterator( const QList<QString>::iterator &layerIt, LayerFeatures *parent );
iterator( const QList<QString>::const_iterator &layerIt, const LayerFeatures *parent );
~iterator();
const iterator &operator++();
iterator operator++( int ) { iterator tmp( *this ); ++*this; return tmp; }
Expand All @@ -77,14 +77,14 @@ namespace QgsGeometryCheckerUtils
bool nextLayerFeature( bool begin );
bool nextLayer( bool begin );
bool nextFeature( bool begin );
QList<QString>::iterator mLayerIt;
QList<QString>::const_iterator mLayerIt;
QgsFeatureIds::const_iterator mFeatureIt;
LayerFeatures *mParent;
LayerFeature *mCurrentFeature = nullptr;
const LayerFeatures *mParent;
const LayerFeature *mCurrentFeature = nullptr;
};

iterator begin() { return iterator( mLayerIds.begin(), this ); }
iterator end() { return iterator( mLayerIds.end(), this ); }
iterator begin() const { return iterator( mLayerIds.constBegin(), this ); }
iterator end() const { return iterator( mLayerIds.end(), this ); }
private:
QMap<QString, QgsFeaturePool *> mFeaturePools;
QMap<QString, QgsFeatureIds> mFeatureIds;
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h
View file
Expand Up @@ -48,8 +48,6 @@ class ANALYSIS_EXPORT QgsGeometryContainedCheckError : public QgsGeometryCheckEr

class ANALYSIS_EXPORT QgsGeometryContainedCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometryContainedCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryDangleCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryDangleCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryDegeneratePolygonCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometryDegeneratePolygonCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.h
View file
Expand Up @@ -49,8 +49,6 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateCheckError : public QgsGeometryCheckEr

class ANALYSIS_EXPORT QgsGeometryDuplicateCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometryDuplicateCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryDuplicateNodesCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometryDuplicateNodesCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.h
View file
Expand Up @@ -25,8 +25,6 @@ class QgsSpatialIndex;

class ANALYSIS_EXPORT QgsGeometryFollowBoundariesCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryFollowBoundariesCheck( QgsGeometryCheckerContext *context, QgsVectorLayer *checkLayer );
~QgsGeometryFollowBoundariesCheck() override;
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h
View file
Expand Up @@ -74,8 +74,6 @@ class ANALYSIS_EXPORT QgsGeometryGapCheckError : public QgsGeometryCheckError

class ANALYSIS_EXPORT QgsGeometryGapCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryGapCheck( QgsGeometryCheckerContext *context, double thresholdMapUnits )
: QgsGeometryCheck( LayerCheck, {QgsWkbTypes::PolygonGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryholecheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryHoleCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometryHoleCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryLineIntersectionCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryLineIntersectionCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryLineLayerIntersectionCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryLineLayerIntersectionCheck( QgsGeometryCheckerContext *context, const QString &checkLayer )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry}, context ), mCheckLayer( checkLayer )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrymultipartcheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryMultipartCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometryMultipartCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
View file
Expand Up @@ -23,7 +23,7 @@ void QgsGeometryOverlapCheck::collectErrors( QList<QgsGeometryCheckError *> &err
double overlapThreshold = mThresholdMapUnits;
QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds() : ids;
const QgsGeometryCheckerUtils::LayerFeatures layerFeaturesA( mContext->featurePools, featureIds, mCompatibleGeometryTypes, progressCounter, true );
const QList<QString> layerIds = featureIds.keys();
QList<QString> layerIds = featureIds.keys();
for ( const QgsGeometryCheckerUtils::LayerFeature &layerFeatureA : layerFeaturesA )
{
// Ensure each pair of layers only gets compared once: remove the current layer from the layerIds, but add it to the layerList for layerFeaturesB
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
View file
Expand Up @@ -72,8 +72,6 @@ class ANALYSIS_EXPORT QgsGeometryOverlapCheckError : public QgsGeometryCheckErro

class ANALYSIS_EXPORT QgsGeometryOverlapCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryOverlapCheck( QgsGeometryCheckerContext *context, double thresholdMapUnits )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PolygonGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryPointCoveredByLineCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryPointCoveredByLineCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::PointGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometryPointInPolygonCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryPointInPolygonCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::PointGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometrySegmentLengthCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometrySegmentLengthCheck( QgsGeometryCheckerContext *context, double minLengthMapUnits )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryselfcontactcheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometrySelfContactCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometrySelfContactCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.h
View file
Expand Up @@ -49,8 +49,6 @@ class ANALYSIS_EXPORT QgsGeometrySelfIntersectionCheckError : public QgsGeometry

class ANALYSIS_EXPORT QgsGeometrySelfIntersectionCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
explicit QgsGeometrySelfIntersectionCheck( QgsGeometryCheckerContext *context )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context ) {}
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
View file
Expand Up @@ -22,8 +22,6 @@

class ANALYSIS_EXPORT QgsGeometrySliverPolygonCheck : public QgsGeometryAreaCheck
{
Q_OBJECT

public:
QgsGeometrySliverPolygonCheck( QgsGeometryCheckerContext *context, double threshold, double maxAreaMapUnits )
: QgsGeometryAreaCheck( context, threshold )
Expand Down
2 changes: 0 additions & 2 deletions src/analysis/vector/geometry_checker/qgsgeometrytypecheck.h
View file
Expand Up @@ -46,8 +46,6 @@ class ANALYSIS_EXPORT QgsGeometryTypeCheckError : public QgsGeometryCheckError

class ANALYSIS_EXPORT QgsGeometryTypeCheck : public QgsGeometryCheck
{
Q_OBJECT

public:
QgsGeometryTypeCheck( QgsGeometryCheckerContext *context, int allowedTypes )
: QgsGeometryCheck( FeatureCheck, {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}, context )
Expand Down

0 comments on commit 37d0b7b

Please sign in to comment.