Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sipify] remove redundant private sections
  • Loading branch information
3nids committed Oct 9, 2017
1 parent e30cc31 commit 6e14854
Show file tree
Hide file tree
Showing 63 changed files with 6 additions and 94 deletions.
1 change: 0 additions & 1 deletion python/analysis/network/qgsgraphbuilderinterface.sip
Expand Up @@ -23,7 +23,6 @@ class QgsGraphBuilderInterface
%TypeHeaderCode
#include "qgsgraphbuilderinterface.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsGraphBuilder * >( sipCpp ) != NULL )
sipType = sipType_QgsGraphBuilder;
Expand Down
1 change: 0 additions & 1 deletion python/analysis/network/qgsgraphdirector.sip
Expand Up @@ -24,7 +24,6 @@ class QgsGraphDirector : QObject
%TypeHeaderCode
#include "qgsgraphdirector.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsVectorLayerDirector * >( sipCpp ) != NULL )
sipType = sipType_QgsVectorLayerDirector;
Expand Down
1 change: 0 additions & 1 deletion python/analysis/network/qgsnetworkstrategy.sip
Expand Up @@ -28,7 +28,6 @@ class QgsNetworkStrategy
%TypeHeaderCode
#include "qgsnetworkstrategy.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsNetworkDistanceStrategy * >( sipCpp ) != NULL )
sipType = sipType_QgsNetworkDistanceStrategy;
Expand Down
1 change: 0 additions & 1 deletion python/analysis/raster/qgsalignraster.sip
Expand Up @@ -25,7 +25,6 @@ class QgsAlignRaster

%TypeHeaderCode
#include "qgsalignraster.h"

#include <gdal_version.h>
%End
public:
Expand Down
1 change: 0 additions & 1 deletion python/core/annotations/qgsannotation.sip
Expand Up @@ -30,7 +30,6 @@ class QgsAnnotation : QObject
%TypeHeaderCode
#include "qgsannotation.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsTextAnnotation * >( sipCpp ) )
sipType = sipType_QgsTextAnnotation;
Expand Down
2 changes: 0 additions & 2 deletions python/core/composer/qgscomposeritem.sip
Expand Up @@ -17,7 +17,6 @@ class QgsComposerItem: QgsComposerObject, QGraphicsRectItem

%TypeHeaderCode
#include "qgscomposeritem.h"

#include <qgscomposerarrow.h>
#include <qgscomposerframe.h>
#include <qgscomposeritemgroup.h>
Expand All @@ -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)
Expand Down
1 change: 0 additions & 1 deletion python/core/composer/qgscomposermultiframe.sip
Expand Up @@ -27,7 +27,6 @@ class QgsComposerMultiFrame: QgsComposerObject
%TypeHeaderCode
#include "qgscomposermultiframe.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsComposerHtml *>( sipCpp ) != NULL )
sipType = sipType_QgsComposerHtml;
Expand Down
1 change: 0 additions & 1 deletion python/core/effects/qgspainteffect.sip
Expand Up @@ -37,7 +37,6 @@ class QgsPaintEffect
%TypeHeaderCode
#include "qgspainteffect.h"
%End

%ConvertToSubClassCode
if ( sipCpp->type() == "drawSource" && dynamic_cast<QgsDrawSourceEffect *>( sipCpp ) != NULL )
{
Expand Down
1 change: 0 additions & 1 deletion python/core/expression/qgsexpressionnode.sip
Expand Up @@ -21,7 +21,6 @@ class QgsExpressionNode /Abstract/
%TypeHeaderCode
#include "qgsexpressionnode.h"
%End

%ConvertToSubClassCode
switch ( sipCpp->nodeType() )
{
Expand Down
1 change: 0 additions & 1 deletion python/core/geometry/qgsabstractgeometry.sip
Expand Up @@ -24,7 +24,6 @@ class QgsAbstractGeometry
%TypeHeaderCode
#include "qgsabstractgeometry.h"
%End

%ConvertToSubClassCode
if ( qgsgeometry_cast<QgsPoint *>( sipCpp ) != nullptr )
sipType = sipType_QgsPoint;
Expand Down
2 changes: 0 additions & 2 deletions python/core/gps/qgsgpsconnection.sip
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion python/core/layertree/qgslayertreemodel.sip
Expand Up @@ -30,7 +30,6 @@ class QgsLayerTreeModel : QAbstractItemModel
%TypeHeaderCode
#include "qgslayertreemodel.h"
%End

%ConvertToSubClassCode
if ( sipCpp->inherits( "QgsLayerTreeModel" ) )
sipType = sipType_QgsLayerTreeModel;
Expand Down
1 change: 0 additions & 1 deletion python/core/layertree/qgslayertreenode.sip
Expand Up @@ -57,7 +57,6 @@ class QgsLayerTreeNode : QObject
%TypeHeaderCode
#include "qgslayertreenode.h"
%End

%ConvertToSubClassCode
if ( sipCpp->inherits( "QgsLayerTreeNode" ) )
{
Expand Down
2 changes: 0 additions & 2 deletions python/core/layout/qgslayoutitem.sip
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion python/core/processing/qgsprocessingalgorithm.sip
Expand Up @@ -26,7 +26,6 @@ class QgsProcessingAlgorithm
%TypeHeaderCode
#include "qgsprocessingalgorithm.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast< QgsProcessingModelAlgorithm * >( sipCpp ) != NULL )
sipType = sipType_QgsProcessingModelAlgorithm;
Expand Down
1 change: 0 additions & 1 deletion python/core/processing/qgsprocessingoutputs.sip
Expand Up @@ -26,7 +26,6 @@ class QgsProcessingOutputDefinition
%TypeHeaderCode
#include "qgsprocessingoutputs.h"
%End

%ConvertToSubClassCode
if ( sipCpp->type() == QgsProcessingOutputVectorLayer::typeName() )
sipType = sipType_QgsProcessingOutputVectorLayer;
Expand Down
1 change: 0 additions & 1 deletion python/core/processing/qgsprocessingparameters.sip
Expand Up @@ -143,7 +143,6 @@ class QgsProcessingParameterDefinition
%TypeHeaderCode
#include "qgsprocessingparameters.h"
%End

%ConvertToSubClassCode
if ( sipCpp->type() == QgsProcessingParameterBoolean::typeName() )
sipType = sipType_QgsProcessingParameterBoolean;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsapplication.sip
Expand Up @@ -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 )
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsattributeeditorelement.sip
Expand Up @@ -24,7 +24,6 @@ class QgsAttributeEditorElement /Abstract/
%TypeHeaderCode
#include "qgsattributeeditorelement.h"
%End

%ConvertToSubClassCode
switch ( sipCpp->type() )
{
Expand Down
1 change: 0 additions & 1 deletion python/core/qgscolorramp.sip
Expand Up @@ -18,7 +18,6 @@ class QgsColorRamp
%TypeHeaderCode
#include "qgscolorramp.h"
%End

%ConvertToSubClassCode
if ( sipCpp->type() == "gradient" )
sipType = sipType_QgsGradientColorRamp;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgscolorscheme.sip
Expand Up @@ -26,7 +26,6 @@ class QgsColorScheme
%TypeHeaderCode
#include "qgscolorscheme.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsUserColorScheme *>( sipCpp ) != NULL )
sipType = sipType_QgsUserColorScheme;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsdataitem.sip
Expand Up @@ -22,7 +22,6 @@ class QgsDataItem : QObject
%TypeHeaderCode
#include "qgsdataitem.h"
%End

%ConvertToSubClassCode
if ( qobject_cast<QgsLayerItem *>( sipCpp ) )
sipType = sipType_QgsLayerItem;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsdataprovider.sip
Expand Up @@ -29,7 +29,6 @@ class QgsDataProvider : QObject
%TypeHeaderCode
#include "qgsdataprovider.h"
%End

%ConvertToSubClassCode
if ( qobject_cast<QgsVectorDataProvider *>( sipCpp ) )
{
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsdiagramrenderer.sip
Expand Up @@ -452,7 +452,6 @@ class QgsDiagramRenderer
%TypeHeaderCode
#include "qgsdiagramrenderer.h"
%End

%ConvertToSubClassCode
if ( sipCpp->rendererName() == QStringLiteral( "SingleCategory" ) )
sipType = sipType_QgsSingleCategoryDiagramRenderer;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsfeature.sip
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsmaplayer.sip
Expand Up @@ -22,7 +22,6 @@ class QgsMapLayer : QObject
%TypeHeaderCode
#include "qgsmaplayer.h"
%End

%ConvertToSubClassCode
QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( sipCpp );

Expand Down
1 change: 0 additions & 1 deletion python/core/qgspropertycollection.sip
Expand Up @@ -21,7 +21,6 @@ class QgsAbstractPropertyCollection
%TypeHeaderCode
#include "qgspropertycollection.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsPropertyCollection *>( sipCpp ) )
sipType = sipType_QgsPropertyCollection;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgspropertytransformer.sip
Expand Up @@ -149,7 +149,6 @@ class QgsPropertyTransformer
%TypeHeaderCode
#include "qgspropertytransformer.h"
%End

%ConvertToSubClassCode
if ( sipCpp->transformerType() == QgsPropertyTransformer::GenericNumericTransformer )
sipType = sipType_QgsGenericNumericTransformer;
Expand Down
1 change: 0 additions & 1 deletion python/core/qgsrunprocess.sip
Expand Up @@ -38,7 +38,6 @@ class QgsRunProcess: QObject /NoDefaultCtors/

private:
QgsRunProcess( const QString &action, bool capture ) ;
private:
~QgsRunProcess() ;
};

Expand Down
1 change: 0 additions & 1 deletion python/core/qgssqlstatement.sip
Expand Up @@ -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() )
{
Expand Down
2 changes: 0 additions & 2 deletions python/core/raster/qgsrasterinterface.sip
Expand Up @@ -72,7 +72,6 @@ class QgsRasterInterface

%TypeHeaderCode
#include "qgsrasterinterface.h"

// QgsRasterInterface subclasses
#include <qgsbrightnesscontrastfilter.h>
#include <qgshuesaturationfilter.h>
Expand All @@ -90,7 +89,6 @@ class QgsRasterInterface
#include <qgssinglebandgrayrenderer.h>
#include <qgssinglebandpseudocolorrenderer.h>
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsBrightnessContrastFilter *>( sipCpp ) )
sipType = sipType_QgsBrightnessContrastFilter;
Expand Down
2 changes: 0 additions & 2 deletions python/core/raster/qgsrasterresampler.sip
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions python/core/raster/qgsrastershaderfunction.sip
Expand Up @@ -20,10 +20,8 @@ class QgsRasterShaderFunction

%TypeHeaderCode
#include "qgsrastershaderfunction.h"

#include <qgscolorrampshader.h>
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsColorRampShader *>( sipCpp ) != NULL )
sipType = sipType_QgsColorRampShader;
Expand Down
1 change: 0 additions & 1 deletion python/core/symbology/qgsmarkersymbollayer.sip
Expand Up @@ -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 ) ;
};

Expand Down
1 change: 0 additions & 1 deletion python/core/symbology/qgspointclusterrenderer.sip
Expand Up @@ -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 ) ;

};
Expand Down
1 change: 0 additions & 1 deletion python/core/symbology/qgspointdisplacementrenderer.sip
Expand Up @@ -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 ) ;
};

Expand Down
1 change: 0 additions & 1 deletion python/core/symbology/qgsrenderer.sip
Expand Up @@ -48,7 +48,6 @@ class QgsFeatureRenderer
%TypeHeaderCode
#include "qgsrenderer.h"
%End

%ConvertToSubClassCode
if ( sipCpp->type() == "singleSymbol" )
sipType = sipType_QgsSingleSymbolRenderer;
Expand Down
1 change: 0 additions & 1 deletion python/core/symbology/qgssymbol.sip
Expand Up @@ -19,7 +19,6 @@ class QgsSymbol
%TypeHeaderCode
#include "qgssymbol.h"
%End

%ConvertToSubClassCode
switch ( sipCpp->type() )
{
Expand Down
2 changes: 0 additions & 2 deletions python/core/symbology/qgssymbollayer.sip
Expand Up @@ -16,10 +16,8 @@ class QgsSymbolLayer

%TypeHeaderCode
#include "qgssymbollayer.h"

#include <qgslinesymbollayer.h>
%End

%ConvertToSubClassCode
switch ( sipCpp->type() )
{
Expand Down
1 change: 0 additions & 1 deletion python/gui/editorwidgets/core/qgswidgetwrapper.sip
Expand Up @@ -32,7 +32,6 @@ class QgsWidgetWrapper : QObject
%TypeHeaderCode
#include "qgswidgetwrapper.h"
%End

%ConvertToSubClassCode
if ( qobject_cast<QgsEditorWidgetWrapper *>( sipCpp ) )
sipType = sipType_QgsEditorWidgetWrapper;
Expand Down
1 change: 0 additions & 1 deletion python/gui/editorwidgets/qgsdoublespinbox.sip
Expand Up @@ -29,7 +29,6 @@ class QgsDoubleSpinBox : QDoubleSpinBox
%TypeHeaderCode
#include "qgsdoublespinbox.h"
%End

%ConvertToSubClassCode
if ( qobject_cast<QgsDoubleSpinBox *>( sipCpp ) )
sipType = sipType_QgsDoubleSpinBox;
Expand Down
1 change: 0 additions & 1 deletion python/gui/editorwidgets/qgsrelationreferencewidget.sip
Expand Up @@ -23,7 +23,6 @@ class QgsRelationReferenceWidget : QWidget
%TypeHeaderCode
#include "qgsrelationreferencewidget.h"
%End

%ConvertToSubClassCode
if ( qobject_cast<QgsRelationReferenceWidget *>( sipCpp ) )
sipType = sipType_QgsRelationReferenceWidget;
Expand Down
1 change: 0 additions & 1 deletion python/gui/editorwidgets/qgsspinbox.sip
Expand Up @@ -29,7 +29,6 @@ class QgsSpinBox : QSpinBox
%TypeHeaderCode
#include "qgsspinbox.h"
%End

%ConvertToSubClassCode
if ( qobject_cast<QgsSpinBox *>( sipCpp ) )
sipType = sipType_QgsSpinBox;
Expand Down
1 change: 0 additions & 1 deletion python/gui/layertree/qgslayertreeview.sip
Expand Up @@ -30,7 +30,6 @@ class QgsLayerTreeView : QTreeView
%TypeHeaderCode
#include "qgslayertreeview.h"
%End

%ConvertToSubClassCode
if ( sipCpp->inherits( "QgsLayerTreeView" ) )
sipType = sipType_QgsLayerTreeView;
Expand Down
1 change: 0 additions & 1 deletion python/gui/layout/qgslayoutviewmouseevent.sip
Expand Up @@ -23,7 +23,6 @@ class QgsLayoutViewMouseEvent : QMouseEvent
%TypeHeaderCode
#include "qgslayoutviewmouseevent.h"
%End

%ConvertToSubClassCode
if ( dynamic_cast<QgsLayoutViewMouseEvent *>( sipCpp ) )
sipType = sipType_QgsLayoutViewMouseEvent;
Expand Down

0 comments on commit 6e14854

Please sign in to comment.