Skip to content
Permalink
Browse files

Consolidate all QgsException subclasses in the same header

  • Loading branch information
nyalldawson committed Jun 23, 2017
1 parent 4ea8536 commit cbc9e03b9dc77313562357e275e481cc0dce2515
Showing with 114 additions and 153 deletions.
  1. +1 −1 python/core/core.sip
  2. +2 −2 python/core/qgsexception.sip
  3. +1 −1 src/app/composer/qgscomposermapwidget.cpp
  4. +1 −1 src/app/gps/qgsgpsmarker.cpp
  5. +1 −1 src/app/qgsdecorationlayoutextent.cpp
  6. +1 −1 src/app/qgsdecorationnortharrow.cpp
  7. +1 −1 src/app/qgsmapcanvasdockwidget.cpp
  8. +1 −1 src/app/qgsmaptooladdfeature.cpp
  9. +1 −1 src/app/qgsmaptoolannotation.cpp
  10. +1 −1 src/app/qgsmaptoolfeatureaction.cpp
  11. +1 −1 src/app/qgsmaptoolselectutils.cpp
  12. +1 −1 src/app/qgsmaptoolshowhidelabels.cpp
  13. +1 −1 src/app/qgsmeasuretool.cpp
  14. +0 −2 src/core/CMakeLists.txt
  15. +1 −1 src/core/composer/qgscomposerattributetablev2.cpp
  16. +1 −1 src/core/composer/qgscomposermapgrid.cpp
  17. +1 −1 src/core/composer/qgscomposermapoverview.cpp
  18. +1 −1 src/core/expression/qgsexpressionfunction.cpp
  19. +1 −1 src/core/processing/qgsprocessingalgorithm.cpp
  20. +1 −1 src/core/processing/qgsprocessingcontext.h
  21. +0 −40 src/core/processing/qgsprocessingexception.h
  22. +1 −1 src/core/processing/qgsprocessingmodelalgorithm.cpp
  23. +1 −1 src/core/processing/qgsprocessingutils.cpp
  24. +1 −1 src/core/providers/memory/qgsmemoryfeatureiterator.cpp
  25. +1 −1 src/core/qgscachedfeatureiterator.cpp
  26. +1 −1 src/core/qgscoordinatetransform.cpp
  27. +1 −1 src/core/qgscoordinateutils.cpp
  28. +0 −32 src/core/qgscsexception.h
  29. +1 −1 src/core/qgsdistancearea.cpp
  30. +42 −7 src/core/qgsexception.h
  31. +1 −1 src/core/qgsfeatureiterator.cpp
  32. +1 −1 src/core/qgsjsonutils.cpp
  33. +1 −1 src/core/qgsmaprendererjob.cpp
  34. +1 −1 src/core/qgsmapsettings.cpp
  35. +1 −1 src/core/qgspallabeling.cpp
  36. +1 −1 src/core/qgstracer.cpp
  37. +1 −1 src/core/qgsvectorfilewriter.cpp
  38. +1 −1 src/core/qgsvectorlayer.cpp
  39. +1 −1 src/core/qgsvectorlayerexporter.cpp
  40. +1 −1 src/core/qgsvectorlayerfeatureiterator.cpp
  41. +1 −1 src/core/qgsvectorlayerrenderer.cpp
  42. +1 −1 src/core/raster/qgsrasterlayerrenderer.cpp
  43. +1 −1 src/core/raster/qgsrasterprojector.cpp
  44. +1 −1 src/gui/qgsextentgroupbox.cpp
  45. +1 −1 src/gui/qgsmapcanvas.cpp
  46. +1 −1 src/gui/qgsmapcanvasannotationitem.cpp
  47. +1 −1 src/gui/qgsmaptoolcapture.cpp
  48. +1 −1 src/gui/qgsmaptoolidentify.cpp
  49. +1 −1 src/gui/qgssourceselectdialog.cpp
  50. +1 −1 src/plugins/grass/qgsgrassnewmapset.cpp
  51. +1 −1 src/plugins/grass/qgsgrassregion.cpp
  52. +1 −1 src/providers/arcgisrest/qgsafsfeatureiterator.cpp
  53. +1 −1 src/providers/db2/qgsdb2featureiterator.cpp
  54. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  55. +1 −1 src/providers/gpx/qgsgpxfeatureiterator.cpp
  56. +1 −1 src/providers/mssql/qgsmssqlfeatureiterator.cpp
  57. +1 −1 src/providers/ogr/qgsogrfeatureiterator.cpp
  58. +1 −1 src/providers/oracle/qgsoraclefeatureiterator.cpp
  59. +1 −1 src/providers/postgres/qgspostgresfeatureiterator.cpp
  60. +1 −1 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  61. +1 −1 src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
  62. +1 −1 src/providers/wcs/qgswcsprovider.cpp
  63. +1 −1 src/providers/wfs/qgswfsfeatureiterator.cpp
  64. +1 −1 src/providers/wms/qgswmscapabilities.cpp
  65. +1 −1 src/providers/wms/qgswmsprovider.cpp
  66. +1 −1 src/server/qgsconfigparserutils.cpp
  67. +1 −1 src/server/qgsserverprojectparser.cpp
  68. +1 −1 src/server/services/wcs/qgswcsdescribecoverage.cpp
  69. +1 −1 src/server/services/wcs/qgswcsgetcapabilities.cpp
  70. +1 −1 src/server/services/wcs/qgswcsutils.cpp
  71. +1 −1 src/server/services/wfs/qgswfsdescribefeaturetype.cpp
  72. +1 −1 src/server/services/wfs/qgswfsgetcapabilities.cpp
  73. +1 −1 src/server/services/wms/qgswmsgetcapabilities.cpp
  74. +1 −1 src/server/services/wms/qgswmsgetcontext.cpp
  75. +1 −1 src/server/services/wms/qgswmsrenderer.cpp
@@ -3,7 +3,7 @@

%ModuleCode

#include "qgsprocessingexception.h"
#include "qgsexception.h"

QString getTraceback()
{
@@ -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
@@ -37,7 +37,7 @@
#include "qgsmapthemecollection.h"
#include "qgsmapthemes.h"
#include "qgsguiutils.h"
#include "qgscsexception.h"
#include "qgsexception.h"

#include <QMessageBox>

@@ -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 )
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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>
@@ -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"
@@ -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"

@@ -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"
@@ -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"
@@ -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
@@ -26,7 +26,7 @@
#include "qgsproject.h"
#include "qgsrelationmanager.h"
#include "qgsgeometry.h"
#include "qgscsexception.h"
#include "qgsexception.h"
#include "qgsmapsettings.h"

//QgsComposerAttributeTableCompareV2
@@ -31,7 +31,7 @@
#include "qgslogger.h"
#include "qgsfontutils.h"
#include "qgsexpressioncontext.h"
#include "qgscsexception.h"
#include "qgsexception.h"
#include "qgssettings.h"

#include <QPainter>
@@ -25,7 +25,7 @@
#include "qgspathresolver.h"
#include "qgsreadwritecontext.h"
#include "qgscomposerutils.h"
#include "qgscsexception.h"
#include "qgsexception.h"

#include <QPainter>

@@ -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"
@@ -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"

@@ -24,7 +24,7 @@
#include "qgsexpressioncontext.h"
#include "qgsfeaturerequest.h"
#include "qgsmaplayerlistutils.h"
#include "qgsprocessingexception.h"
#include "qgsexception.h"

/**
* \class QgsProcessingContext

This file was deleted.

@@ -19,7 +19,7 @@
#include "qgsprocessingregistry.h"
#include "qgsprocessingfeedback.h"
#include "qgsxmlutils.h"
#include "qgsprocessingexception.h"
#include "qgsexception.h"
#include <QFile>
#include <QTextStream>

@@ -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"
@@ -21,7 +21,7 @@
#include "qgsspatialindex.h"
#include "qgsmessagelog.h"
#include "qgsproject.h"
#include "qgscsexception.h"
#include "qgsexception.h"

///@cond PRIVATE

@@ -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 )
@@ -21,7 +21,7 @@
#include "qgslogger.h"
#include "qgspointxy.h"
#include "qgsrectangle.h"
#include "qgscsexception.h"
#include "qgsexception.h"

//qt includes
#include <QDomNode>
@@ -20,7 +20,7 @@
#include "qgscoordinatetransform.h"
#include "qgsproject.h"
#include "qgis.h"
#include "qgscsexception.h"
#include "qgsexception.h"

///@cond NOT_STABLE_API

This file was deleted.

@@ -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

0 comments on commit cbc9e03

Please sign in to comment.
You can’t perform that action at this time.