From 0c0a1f81c259050e56f364633b83c9cde29ce659 Mon Sep 17 00:00:00 2001 From: vcloarec Date: Sun, 30 May 2021 21:04:23 -0400 Subject: [PATCH] pure QgsMapRendererJob::startPrivate() ans SIP_ABSTRACT --- .../maprenderer/qgsmaprenderercustompainterjob.sip.in | 2 +- .../auto_generated/maprenderer/qgsmaprendererjob.sip.in | 4 ++-- src/core/maprenderer/qgsmaprenderercustompainterjob.h | 2 +- src/core/maprenderer/qgsmaprendererjob.h | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in b/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in index af351fdc649..95fe52c8ec3 100644 --- a/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in +++ b/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in @@ -9,7 +9,7 @@ -class QgsMapRendererAbstractCustomPainterJob : QgsMapRendererJob +class QgsMapRendererAbstractCustomPainterJob : QgsMapRendererJob /Abstract/ { %Docstring(signature="appended") Abstract base class for map renderer jobs which use custom painters. diff --git a/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in b/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in index 64472ef60d1..1fd40fed406 100644 --- a/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in +++ b/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in @@ -13,7 +13,7 @@ -class QgsMapRendererJob : QObject +class QgsMapRendererJob : QObject /Abstract/ { %Docstring(signature="appended") Abstract base class for map rendering implementations. @@ -198,7 +198,7 @@ emitted when asynchronous rendering is finished (or canceled). }; -class QgsMapRendererQImageJob : QgsMapRendererJob +class QgsMapRendererQImageJob : QgsMapRendererJob /Abstract/ { %Docstring(signature="appended") Intermediate base class adding functionality that allows client to query the rendered image. diff --git a/src/core/maprenderer/qgsmaprenderercustompainterjob.h b/src/core/maprenderer/qgsmaprenderercustompainterjob.h index 8d52e78d3b5..a41dd8bf621 100644 --- a/src/core/maprenderer/qgsmaprenderercustompainterjob.h +++ b/src/core/maprenderer/qgsmaprenderercustompainterjob.h @@ -28,7 +28,7 @@ * * \since QGIS 3.10 */ -class CORE_EXPORT QgsMapRendererAbstractCustomPainterJob : public QgsMapRendererJob +class CORE_EXPORT QgsMapRendererAbstractCustomPainterJob : public QgsMapRendererJob SIP_ABSTRACT { Q_OBJECT public: diff --git a/src/core/maprenderer/qgsmaprendererjob.h b/src/core/maprenderer/qgsmaprendererjob.h index 8e9f7cf717b..ed69c7230d8 100644 --- a/src/core/maprenderer/qgsmaprendererjob.h +++ b/src/core/maprenderer/qgsmaprendererjob.h @@ -210,7 +210,7 @@ struct LabelRenderJob * * \since QGIS 2.4 */ -class CORE_EXPORT QgsMapRendererJob : public QObject +class CORE_EXPORT QgsMapRendererJob : public QObject SIP_ABSTRACT { Q_OBJECT public: @@ -492,11 +492,11 @@ class CORE_EXPORT QgsMapRendererJob : public QObject QPainter *allocateImageAndPainter( QString layerId, QImage *&image ); /** - * This virtual method has to be implemented in derived class for starting the rendering. + * This pure virtual method has to be implemented in derived class for starting the rendering. * This method is called in start() method after ckecking if the map can be rendered. * \since QGIS 3.20 */ - virtual void startPrivate() {}; + virtual void startPrivate() = 0; }; @@ -509,7 +509,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject * * \since QGIS 2.4 */ -class CORE_EXPORT QgsMapRendererQImageJob : public QgsMapRendererJob +class CORE_EXPORT QgsMapRendererQImageJob : public QgsMapRendererJob SIP_ABSTRACT { Q_OBJECT