QgsFeaturePool does not need to be a QObject

qgis · Aug 20, 2018 · a59900f · a59900f
1 parent 0ba7b5f
commit a59900f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -169,7 +169,6 @@ SET(QGIS_ANALYSIS_MOC_HDRS
 
   processing/qgsalgorithmfiledownloader.h
 
-  vector/geometry_checker/qgsfeaturepool.h
   vector/geometry_checker/qgsgeometrychecker.h
   vector/geometry_checker/qgsgeometryanglecheck.h
   vector/geometry_checker/qgsgeometryareacheck.h
@@ -255,6 +254,7 @@ SET(QGIS_ANALYSIS_HDRS
   vector/qgsgeometrysnapper.h
   vector/qgszonalstatistics.h
   vector/geometry_checker/qgsgeometrycheckerutils.h
+  vector/geometry_checker/qgsfeaturepool.h
 
   interpolation/qgsinterpolator.h
   interpolation/qgsgridfilewriter.h

diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -20,10 +20,8 @@
 #include "qgsgeometry.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
-#include "qgsgeometryutils.h"
 
 #include <QMutexLocker>
-#include <limits>
 
 QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, const QgsCoordinateTransform &layerToMapTransform, bool selectedOnly )
   : mFeatureCache( CACHE_SIZE )

diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.h b/src/analysis/vector/geometry_checker/qgsfeaturepool.h
@@ -20,19 +20,16 @@
 #define QGS_FEATUREPOOL_H
 
 #include <QCache>
-#include <QLinkedList>
-#include <QMap>
 #include <QMutex>
 #include "qgis_analysis.h"
 #include "qgsfeature.h"
 #include "qgsspatialindex.h"
-#include "qgsgeometrycheckerutils.h"
 
 class QgsVectorLayer;
 
-class ANALYSIS_EXPORT QgsFeaturePool : public QObject
+class ANALYSIS_EXPORT QgsFeaturePool
 {
-    Q_OBJECT
+
   public:
     QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, const QgsCoordinateTransform &layerToMapTransform, bool selectedOnly = false );
     bool get( QgsFeatureId id, QgsFeature &feature );