Consolidate all QgsException subclasses in the same header

qgis · Jun 23, 2017 · cbc9e03 · cbc9e03
1 parent 4ea8536
commit cbc9e03
Show file tree

Hide file tree

Showing 75 changed files with 114 additions and 153 deletions.
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -3,7 +3,7 @@
 
 %ModuleCode
 
-#include "qgsprocessingexception.h"
+#include "qgsexception.h"
 
 QString getTraceback()
 {

diff --git a/python/core/qgsexception.sip b/python/core/qgsexception.sip
@@ -1,7 +1,7 @@
 %Exception QgsCsException(SIP_Exception) /PyName=QgsCsException/
 {
 %TypeHeaderCode
-#include <qgscsexception.h>
+#include <qgsexception.h>
 %End
 %RaiseCode
   SIP_BLOCK_THREADS
@@ -13,7 +13,7 @@
 %Exception QgsProcessingException(SIP_Exception) /PyName=QgsProcessingException/
 {
 %TypeHeaderCode
-#include <qgsprocessingexception.h>
+#include <qgsexception.h>
 %End
 %RaiseCode
   SIP_BLOCK_THREADS

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -37,7 +37,7 @@
 #include "qgsmapthemecollection.h"
 #include "qgsmapthemes.h"
 #include "qgsguiutils.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 #include <QMessageBox>
 

diff --git a/src/app/gps/qgsgpsmarker.cpp b/src/app/gps/qgsgpsmarker.cpp
@@ -18,7 +18,7 @@
 #include "qgsgpsmarker.h"
 #include "qgscoordinatetransform.h"
 #include "qgsmapcanvas.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 QgsGpsMarker::QgsGpsMarker( QgsMapCanvas *mapCanvas )
   : QgsMapCanvasItem( mapCanvas )

diff --git a/src/app/qgsdecorationlayoutextent.cpp b/src/app/qgsdecorationlayoutextent.cpp
@@ -23,7 +23,7 @@
 #include "qgscomposition.h"
 #include "qgscomposermap.h"
 #include "qgsgeometry.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgslinesymbollayer.h"
 #include "qgscomposer.h"
 #include "qgisapp.h"

diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
@@ -27,7 +27,7 @@ email                : tim@linfiniti.com
 #include "qgisapp.h"
 #include "qgsbearingutils.h"
 #include "qgscoordinatetransform.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgslogger.h"
 #include "qgsmaplayer.h"
 #include "qgsproject.h"

diff --git a/src/app/qgsmapcanvasdockwidget.cpp b/src/app/qgsmapcanvasdockwidget.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 #include "qgsmapcanvasdockwidget.h"
 #include "qgsmapcanvas.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsprojectionselectiondialog.h"
 #include "qgsscalecombobox.h"
 #include "qgsdoublespinbox.h"

diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -16,7 +16,7 @@
 #include "qgsmaptooladdfeature.h"
 #include "qgsapplication.h"
 #include "qgsattributedialog.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgscurvepolygon.h"
 #include "qgsfields.h"
 #include "qgsgeometry.h"

diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -28,7 +28,7 @@
 #include "qgssvgannotationdialog.h"
 #include "qgssvgannotation.h"
 #include "qgsproject.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsannotationmanager.h"
 #include <QDialog>
 #include <QMouseEvent>

diff --git a/src/app/qgsmaptoolfeatureaction.cpp b/src/app/qgsmaptoolfeatureaction.cpp
@@ -25,7 +25,7 @@
 #include "qgsmessageviewer.h"
 #include "qgsactionmanager.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 #include "qgsproject.h"

diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -25,7 +25,7 @@ email                : jpalmer at linz dot govt dot nz
 #include "qgsgeometry.h"
 #include "qgsrenderer.h"
 #include "qgsrubberband.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgslogger.h"
 #include "qgis.h"
 

diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -18,7 +18,7 @@
 #include "qgsmaptoolshowhidelabels.h"
 
 #include "qgsapplication.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsfeatureiterator.h"
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"

diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -21,7 +21,7 @@
 #include "qgsvectorlayer.h"
 #include "qgssnappingutils.h"
 #include "qgstolerance.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsmeasuredialog.h"
 #include "qgsmeasuretool.h"
 #include "qgscursors.h"

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -738,7 +738,6 @@ SET(QGIS_CORE_HDRS
   qgscoordinatetransform.h
   qgscoordinateutils.h
   qgscrscache.h
-  qgscsexception.h
   qgsdartmeasurement.h
   qgsdatadefinedsizelegend.h
   qgsdataitem.h
@@ -899,7 +898,6 @@ SET(QGIS_CORE_HDRS
   processing/qgsnativealgorithms.h
   processing/qgsprocessingalgorithm.h
   processing/qgsprocessingcontext.h
-  processing/qgsprocessingexception.h
   processing/qgsprocessingmodelalgorithm.h
   processing/qgsprocessingoutputs.h
   processing/qgsprocessingparameters.h

diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -26,7 +26,7 @@
 #include "qgsproject.h"
 #include "qgsrelationmanager.h"
 #include "qgsgeometry.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsmapsettings.h"
 
 //QgsComposerAttributeTableCompareV2

diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -31,7 +31,7 @@
 #include "qgslogger.h"
 #include "qgsfontutils.h"
 #include "qgsexpressioncontext.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgssettings.h"
 
 #include <QPainter>

diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp
@@ -25,7 +25,7 @@
 #include "qgspathresolver.h"
 #include "qgsreadwritecontext.h"
 #include "qgscomposerutils.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 #include <QPainter>
 

diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -35,7 +35,7 @@
 #include "qgsexpressionsorter.h"
 #include "qgssymbollayerutils.h"
 #include "qgsstyle.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsmessagelog.h"
 #include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"

diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp
@@ -23,7 +23,7 @@
 #include "qgsrectangle.h"
 #include "qgsprocessingcontext.h"
 #include "qgsprocessingutils.h"
-#include "qgsprocessingexception.h"
+#include "qgsexception.h"
 #include "qgsmessagelog.h"
 #include "qgsprocessingfeedback.h"
 

diff --git a/src/core/processing/qgsprocessingcontext.h b/src/core/processing/qgsprocessingcontext.h
@@ -24,7 +24,7 @@
 #include "qgsexpressioncontext.h"
 #include "qgsfeaturerequest.h"
 #include "qgsmaplayerlistutils.h"
-#include "qgsprocessingexception.h"
+#include "qgsexception.h"
 
 /**
  * \class QgsProcessingContext

diff --git a/src/core/processing/qgsprocessingexception.h b/src/core/processing/qgsprocessingexception.h
diff --git a/src/core/processing/qgsprocessingmodelalgorithm.cpp b/src/core/processing/qgsprocessingmodelalgorithm.cpp
@@ -19,7 +19,7 @@
 #include "qgsprocessingregistry.h"
 #include "qgsprocessingfeedback.h"
 #include "qgsxmlutils.h"
-#include "qgsprocessingexception.h"
+#include "qgsexception.h"
 #include <QFile>
 #include <QTextStream>
 

diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -18,7 +18,7 @@
 #include "qgsprocessingutils.h"
 #include "qgsproject.h"
 #include "qgssettings.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 #include "qgsprocessingcontext.h"
 #include "qgsvectorlayerexporter.h"
 #include "qgsvectorfilewriter.h"

diff --git a/src/core/providers/memory/qgsmemoryfeatureiterator.cpp b/src/core/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -21,7 +21,7 @@
 #include "qgsspatialindex.h"
 #include "qgsmessagelog.h"
 #include "qgsproject.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 ///@cond PRIVATE
 

diff --git a/src/core/qgscachedfeatureiterator.cpp b/src/core/qgscachedfeatureiterator.cpp
@@ -15,7 +15,7 @@
 
 #include "qgscachedfeatureiterator.h"
 #include "qgsvectorlayercache.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 QgsCachedFeatureIterator::QgsCachedFeatureIterator( QgsVectorLayerCache *vlCache, const QgsFeatureRequest &featureRequest )
   : QgsAbstractFeatureIterator( featureRequest )

diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -21,7 +21,7 @@
 #include "qgslogger.h"
 #include "qgspointxy.h"
 #include "qgsrectangle.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 //qt includes
 #include <QDomNode>

diff --git a/src/core/qgscoordinateutils.cpp b/src/core/qgscoordinateutils.cpp
@@ -20,7 +20,7 @@
 #include "qgscoordinatetransform.h"
 #include "qgsproject.h"
 #include "qgis.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 ///@cond NOT_STABLE_API
 

diff --git a/src/core/qgscsexception.h b/src/core/qgscsexception.h
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -32,7 +32,7 @@
 #include "qgspolygon.h"
 #include "qgssurface.h"
 #include "qgsunittypes.h"
-#include "qgscsexception.h"
+#include "qgsexception.h"
 
 // MSVC compiler doesn't have defined M_PI in math.h
 #ifndef M_PI