Merge pull request #4993 from nyalldawson/remove_analyzer

Remove QgsGeometryAnalyzer, QgsOverlayAnalyzer, QgsPointSample
qgis · Aug 17, 2017 · 5abbab1 · 5abbab1
2 parents 6d38894 + 0227bdc
commit 5abbab1
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 2,512 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -269,6 +269,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsFileDropEdit was removed. Use QgsFileWidget instead.
 - QgsFormAnnotationItem. Use QgsFormAnnotation instead.
+- QgsGeometryAnalyzer. Use the equivalent Processing algorithms instead.
 - QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.
 - QgsHttpTransaction. This class was outdated and code should be ported to native Qt or Python implementations.
 - QgsGenericProjectionSelector. Use QgsProjectionSelectionTreeWidget instead.
@@ -287,6 +288,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.
 - QgsMapToolTouch. The touch navigation functionality is now built into the standard QgsMapToolPan tool.
 - QgsPhotoWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
+- QgsPointSample. Use the Processing "Random Points in Polygon" algorithm instead.
 - QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
 - QgsProjectBadLayerGuiHandler was removed. It was unused in QGIS code and barely useful. Implement your own QgsProjectBadLayerHandler subclass if needed.
 - QgsRendererV2DataDefinedMenus was removed. Use QgsPropertyOverrideButton instead.

diff --git a/python/analysis/analysis_auto.sip b/python/analysis/analysis_auto.sip
@@ -12,9 +12,6 @@
 %Include raster/qgsrastermatrix.sip
 %Include raster/qgsrastercalcnode.sip
 %Include raster/qgstotalcurvaturefilter.sip
-%Include vector/qgsgeometryanalyzer.sip
-%Include vector/qgsoverlayanalyzer.sip
-%Include vector/qgspointsample.sip
 %Include vector/qgstransectsample.sip
 %Include vector/qgszonalstatistics.sip
 %Include interpolation/qgsinterpolator.sip

diff --git a/python/analysis/vector/qgsgeometryanalyzer.sip b/python/analysis/vector/qgsgeometryanalyzer.sip
diff --git a/python/analysis/vector/qgsoverlayanalyzer.sip b/python/analysis/vector/qgsoverlayanalyzer.sip
diff --git a/python/analysis/vector/qgspointsample.sip b/python/analysis/vector/qgspointsample.sip
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -35,12 +35,9 @@ SET(QGIS_ANALYSIS_SRCS
   raster/qgsrastercalculator.cpp
   raster/qgsrastermatrix.cpp
   vector/mersenne-twister.cpp
-  vector/qgsgeometryanalyzer.cpp
   vector/qgsgeometrysnapper.cpp
-  vector/qgspointsample.cpp
   vector/qgstransectsample.cpp
   vector/qgszonalstatistics.cpp
-  vector/qgsoverlayanalyzer.cpp
 
   openstreetmap/qgsosmbase.cpp
   openstreetmap/qgsosmdatabase.cpp
@@ -116,9 +113,6 @@ SET(QGIS_ANALYSIS_HDRS
   raster/qgsrastercalcnode.h
   raster/qgstotalcurvaturefilter.h
 
-  vector/qgsgeometryanalyzer.h
-  vector/qgsoverlayanalyzer.h
-  vector/qgspointsample.h
   vector/qgstransectsample.h
   vector/qgszonalstatistics.h