python/analysis/network/qgsgraphbuilderinterface.sip

@@ -23,7 +23,6 @@ class QgsGraphBuilderInterface
 %TypeHeaderCode
 #include "qgsgraphbuilderinterface.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsGraphBuilder * >( sipCpp ) != NULL )
       sipType = sipType_QgsGraphBuilder;

python/analysis/network/qgsgraphdirector.sip

@@ -24,7 +24,6 @@ class QgsGraphDirector : QObject
 %TypeHeaderCode
 #include "qgsgraphdirector.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsVectorLayerDirector * >( sipCpp ) != NULL )
       sipType = sipType_QgsVectorLayerDirector;

python/analysis/network/qgsnetworkstrategy.sip

@@ -28,7 +28,6 @@ class QgsNetworkStrategy
 %TypeHeaderCode
 #include "qgsnetworkstrategy.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsNetworkDistanceStrategy * >( sipCpp ) != NULL )
       sipType = sipType_QgsNetworkDistanceStrategy;

python/analysis/raster/qgsalignraster.sip

@@ -25,7 +25,6 @@ class QgsAlignRaster
 
 %TypeHeaderCode
 #include "qgsalignraster.h"
-
 #include <gdal_version.h>
 %End
   public:

python/core/annotations/qgsannotation.sip

@@ -30,7 +30,6 @@ class QgsAnnotation : QObject
 %TypeHeaderCode
 #include "qgsannotation.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsTextAnnotation * >( sipCpp ) )
       sipType = sipType_QgsTextAnnotation;

python/core/composer/qgscomposeritem.sip

@@ -17,7 +17,6 @@ class QgsComposerItem: QgsComposerObject, QGraphicsRectItem
 
 %TypeHeaderCode
 #include "qgscomposeritem.h"
-
 #include <qgscomposerarrow.h>
 #include <qgscomposerframe.h>
 #include <qgscomposeritemgroup.h>
@@ -34,7 +33,6 @@ class QgsComposerItem: QgsComposerObject, QGraphicsRectItem
 #include <qgslayoutitemshape.h>
 #include <qgslayoutitempage.h>
 %End
-
 %ConvertToSubClassCode
     // the conversions have to be static, because they're using multiple inheritance
     // (seen in PyQt4 .sip files for some QGraphicsItem classes)

python/core/composer/qgscomposermultiframe.sip

@@ -27,7 +27,6 @@ class QgsComposerMultiFrame: QgsComposerObject
 %TypeHeaderCode
 #include "qgscomposermultiframe.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsComposerHtml *>( sipCpp ) != NULL )
       sipType = sipType_QgsComposerHtml;

python/core/effects/qgspainteffect.sip

@@ -37,7 +37,6 @@ class QgsPaintEffect
 %TypeHeaderCode
 #include "qgspainteffect.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->type() == "drawSource" && dynamic_cast<QgsDrawSourceEffect *>( sipCpp ) != NULL )
     {

python/core/expression/qgsexpressionnode.sip

@@ -21,7 +21,6 @@ class QgsExpressionNode /Abstract/
 %TypeHeaderCode
 #include "qgsexpressionnode.h"
 %End
-
 %ConvertToSubClassCode
     switch ( sipCpp->nodeType() )
     {

python/core/geometry/qgsabstractgeometry.sip

@@ -24,7 +24,6 @@ class QgsAbstractGeometry
 %TypeHeaderCode
 #include "qgsabstractgeometry.h"
 %End
-
 %ConvertToSubClassCode
     if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != nullptr )
       sipType = sipType_QgsPoint;

python/core/gps/qgsgpsconnection.sip

@@ -51,11 +51,9 @@ class QgsGPSConnection : QObject
 
 %TypeHeaderCode
 #include "qgsgpsconnection.h"
-
 #include <qgsgpsdconnection.h>
 #include <qgsnmeaconnection.h>
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->inherits( "QgsGpsdConnection" ) )
       sipType = sipType_QgsGpsdConnection;

python/core/layertree/qgslayertreemodel.sip

@@ -30,7 +30,6 @@ class QgsLayerTreeModel : QAbstractItemModel
 %TypeHeaderCode
 #include "qgslayertreemodel.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->inherits( "QgsLayerTreeModel" ) )
       sipType = sipType_QgsLayerTreeModel;

python/core/layertree/qgslayertreenode.sip

@@ -57,7 +57,6 @@ class QgsLayerTreeNode : QObject
 %TypeHeaderCode
 #include "qgslayertreenode.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->inherits( "QgsLayerTreeNode" ) )
     {

python/core/layout/qgslayoutitem.sip

@@ -18,11 +18,9 @@ class QgsLayoutItem : QgsLayoutObject, QGraphicsRectItem, QgsLayoutUndoObjectInt
 
 %TypeHeaderCode
 #include "qgslayoutitem.h"
-
 #include <qgslayoutitemshape.h>
 #include <qgslayoutitempage.h>
 %End
-
 %ConvertToSubClassCode
     // the conversions have to be static, because they're using multiple inheritance
     // (seen in PyQt4 .sip files for some QGraphicsItem classes)

python/core/processing/qgsprocessingalgorithm.sip

@@ -26,7 +26,6 @@ class QgsProcessingAlgorithm
 %TypeHeaderCode
 #include "qgsprocessingalgorithm.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast< QgsProcessingModelAlgorithm * >( sipCpp ) != NULL )
       sipType = sipType_QgsProcessingModelAlgorithm;

python/core/processing/qgsprocessingoutputs.sip

@@ -26,7 +26,6 @@ class QgsProcessingOutputDefinition
 %TypeHeaderCode
 #include "qgsprocessingoutputs.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->type() == QgsProcessingOutputVectorLayer::typeName() )
       sipType = sipType_QgsProcessingOutputVectorLayer;

python/core/processing/qgsprocessingparameters.sip

@@ -143,7 +143,6 @@ class QgsProcessingParameterDefinition
 %TypeHeaderCode
 #include "qgsprocessingparameters.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->type() == QgsProcessingParameterBoolean::typeName() )
       sipType = sipType_QgsProcessingParameterBoolean;

python/core/qgsapplication.sip

@@ -29,7 +29,6 @@ to change due to centralization.
 %TypeHeaderCode
 #include "qgsapplication.h"
 %End
-
 %TypeCode
     // Convert a Python argv list to a conventional C argc count and argv array.
     static char **qtgui_ArgvToC( PyObject *argvlist, int &argc )

python/core/qgsattributeeditorelement.sip

@@ -24,7 +24,6 @@ class QgsAttributeEditorElement /Abstract/
 %TypeHeaderCode
 #include "qgsattributeeditorelement.h"
 %End
-
 %ConvertToSubClassCode
     switch ( sipCpp->type() )
     {

python/core/qgscolorramp.sip

@@ -18,7 +18,6 @@ class QgsColorRamp
 %TypeHeaderCode
 #include "qgscolorramp.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->type() == "gradient" )
       sipType = sipType_QgsGradientColorRamp;

python/core/qgscolorscheme.sip

@@ -26,7 +26,6 @@ class QgsColorScheme
 %TypeHeaderCode
 #include "qgscolorscheme.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsUserColorScheme *>( sipCpp ) != NULL )
       sipType = sipType_QgsUserColorScheme;

python/core/qgsdataitem.sip

@@ -22,7 +22,6 @@ class QgsDataItem : QObject
 %TypeHeaderCode
 #include "qgsdataitem.h"
 %End
-
 %ConvertToSubClassCode
     if ( qobject_cast<QgsLayerItem *>( sipCpp ) )
       sipType = sipType_QgsLayerItem;

python/core/qgsdataprovider.sip

@@ -29,7 +29,6 @@ class QgsDataProvider : QObject
 %TypeHeaderCode
 #include "qgsdataprovider.h"
 %End
-
 %ConvertToSubClassCode
     if ( qobject_cast<QgsVectorDataProvider *>( sipCpp ) )
     {

python/core/qgsdiagramrenderer.sip

@@ -452,7 +452,6 @@ class QgsDiagramRenderer
 %TypeHeaderCode
 #include "qgsdiagramrenderer.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->rendererName() == QStringLiteral( "SingleCategory" ) )
       sipType = sipType_QgsSingleCategoryDiagramRenderer;

python/core/qgsfeature.sip

@@ -28,7 +28,6 @@ class QgsFeature
 
 %TypeHeaderCode
 #include "qgsfeature.h"
-
 #if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipType_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif

python/core/qgsmaplayer.sip

@@ -22,7 +22,6 @@ class QgsMapLayer : QObject
 %TypeHeaderCode
 #include "qgsmaplayer.h"
 %End
-
 %ConvertToSubClassCode
     QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( sipCpp );
 

python/core/qgspropertycollection.sip

@@ -21,7 +21,6 @@ class QgsAbstractPropertyCollection
 %TypeHeaderCode
 #include "qgspropertycollection.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsPropertyCollection *>( sipCpp ) )
       sipType = sipType_QgsPropertyCollection;

python/core/qgspropertytransformer.sip

@@ -149,7 +149,6 @@ class QgsPropertyTransformer
 %TypeHeaderCode
 #include "qgspropertytransformer.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->transformerType() == QgsPropertyTransformer::GenericNumericTransformer )
       sipType = sipType_QgsGenericNumericTransformer;

python/core/qgsrunprocess.sip

@@ -38,7 +38,6 @@ class QgsRunProcess: QObject /NoDefaultCtors/
 
   private:
     QgsRunProcess( const QString &action, bool capture ) ;
-  private:
     ~QgsRunProcess() ;
 };
 

python/core/qgssqlstatement.sip

@@ -191,7 +191,6 @@ Returns root node of the statement. Root node is null is parsing has failed
 %TypeHeaderCode
 #include "qgssqlstatement.h"
 %End
-
 %ConvertToSubClassCode
         switch ( sipCpp->nodeType() )
         {

python/core/raster/qgsrasterinterface.sip

@@ -72,7 +72,6 @@ class QgsRasterInterface
 
 %TypeHeaderCode
 #include "qgsrasterinterface.h"
-
 // QgsRasterInterface subclasses
 #include <qgsbrightnesscontrastfilter.h>
 #include <qgshuesaturationfilter.h>
@@ -90,7 +89,6 @@ class QgsRasterInterface
 #include <qgssinglebandgrayrenderer.h>
 #include <qgssinglebandpseudocolorrenderer.h>
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsBrightnessContrastFilter *>( sipCpp ) )
       sipType = sipType_QgsBrightnessContrastFilter;

python/core/raster/qgsrasterresampler.sip

@@ -18,11 +18,9 @@ class QgsRasterResampler
 
 %TypeHeaderCode
 #include "qgsrasterresampler.h"
-
 #include "qgsbilinearrasterresampler.h"
 #include "qgscubicrasterresampler.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsBilinearRasterResampler *>( sipCpp ) != NULL )
       sipType = sipType_QgsBilinearRasterResampler;

python/core/raster/qgsrastershaderfunction.sip

@@ -20,10 +20,8 @@ class QgsRasterShaderFunction
 
 %TypeHeaderCode
 #include "qgsrastershaderfunction.h"
-
 #include <qgscolorrampshader.h>
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsColorRampShader *>( sipCpp ) != NULL )
       sipType = sipType_QgsColorRampShader;

python/core/symbology/qgsmarkersymbollayer.sip

@@ -463,7 +463,6 @@ class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
 
   private:
     QgsFilledMarkerSymbolLayer( const QgsFilledMarkerSymbolLayer & );
-  private:
     virtual void draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) ;
 };
 

python/core/symbology/qgspointclusterrenderer.sip

@@ -65,7 +65,6 @@ Creates a renderer from XML element
 %Docstring
  :rtype: QgsPointClusterRenderer
 %End
-  private:
     virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const QgsPointDistanceRenderer::ClusteredGroup &group ) ;
 
 };

python/core/symbology/qgspointdisplacementrenderer.sip

@@ -137,7 +137,6 @@ Create a renderer from XML element
 %Docstring
  :rtype: QgsPointDisplacementRenderer
 %End
-  private:
     virtual void drawGroup( QPointF centerPoint, QgsRenderContext &context, const QgsPointDistanceRenderer::ClusteredGroup &group ) ;
 };
 

python/core/symbology/qgsrenderer.sip

@@ -48,7 +48,6 @@ class QgsFeatureRenderer
 %TypeHeaderCode
 #include "qgsrenderer.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->type() == "singleSymbol" )
       sipType = sipType_QgsSingleSymbolRenderer;

python/core/symbology/qgssymbol.sip

@@ -19,7 +19,6 @@ class QgsSymbol
 %TypeHeaderCode
 #include "qgssymbol.h"
 %End
-
 %ConvertToSubClassCode
     switch ( sipCpp->type() )
     {

python/core/symbology/qgssymbollayer.sip

@@ -16,10 +16,8 @@ class QgsSymbolLayer
 
 %TypeHeaderCode
 #include "qgssymbollayer.h"
-
 #include <qgslinesymbollayer.h>
 %End
-
 %ConvertToSubClassCode
     switch ( sipCpp->type() )
     {

python/gui/editorwidgets/core/qgswidgetwrapper.sip

@@ -32,7 +32,6 @@ class QgsWidgetWrapper : QObject
 %TypeHeaderCode
 #include "qgswidgetwrapper.h"
 %End
-
 %ConvertToSubClassCode
     if ( qobject_cast<QgsEditorWidgetWrapper *>( sipCpp ) )
       sipType = sipType_QgsEditorWidgetWrapper;

python/gui/editorwidgets/qgsdoublespinbox.sip

@@ -29,7 +29,6 @@ class QgsDoubleSpinBox : QDoubleSpinBox
 %TypeHeaderCode
 #include "qgsdoublespinbox.h"
 %End
-
 %ConvertToSubClassCode
     if ( qobject_cast<QgsDoubleSpinBox *>( sipCpp ) )
       sipType = sipType_QgsDoubleSpinBox;

python/gui/editorwidgets/qgsrelationreferencewidget.sip

@@ -23,7 +23,6 @@ class QgsRelationReferenceWidget : QWidget
 %TypeHeaderCode
 #include "qgsrelationreferencewidget.h"
 %End
-
 %ConvertToSubClassCode
     if ( qobject_cast<QgsRelationReferenceWidget *>( sipCpp ) )
       sipType = sipType_QgsRelationReferenceWidget;

python/gui/editorwidgets/qgsspinbox.sip

@@ -29,7 +29,6 @@ class QgsSpinBox : QSpinBox
 %TypeHeaderCode
 #include "qgsspinbox.h"
 %End
-
 %ConvertToSubClassCode
     if ( qobject_cast<QgsSpinBox *>( sipCpp ) )
       sipType = sipType_QgsSpinBox;

python/gui/layertree/qgslayertreeview.sip

@@ -30,7 +30,6 @@ class QgsLayerTreeView : QTreeView
 %TypeHeaderCode
 #include "qgslayertreeview.h"
 %End
-
 %ConvertToSubClassCode
     if ( sipCpp->inherits( "QgsLayerTreeView" ) )
       sipType = sipType_QgsLayerTreeView;

python/gui/layout/qgslayoutviewmouseevent.sip

@@ -23,7 +23,6 @@ class QgsLayoutViewMouseEvent : QMouseEvent
 %TypeHeaderCode
 #include "qgslayoutviewmouseevent.h"
 %End
-
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsLayoutViewMouseEvent *>( sipCpp ) )
       sipType = sipType_QgsLayoutViewMouseEvent;