Merge pull request #5246 from nyalldawson/clazy

Fix some Clazy warnings
qgis · Sep 25, 2017 · 154fd61 · 154fd61
2 parents 14a48c0 + b0b1714
commit 154fd61
Show file tree

Hide file tree

Showing 376 changed files with 1,775 additions and 1,617 deletions.
diff --git a/python/analysis/network/qgsgraphbuilder.sip b/python/analysis/network/qgsgraphbuilder.sip
@@ -44,6 +44,7 @@ class QgsGraphBuilder : QgsGraphBuilderInterface
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/analysis/network/qgsgraphbuilderinterface.sip b/python/analysis/network/qgsgraphbuilderinterface.sip
@@ -92,6 +92,7 @@ Returns measurement tool
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/analysis/vector/qgszonalstatistics.sip b/python/analysis/vector/qgszonalstatistics.sip
@@ -44,7 +44,7 @@ class QgsZonalStatistics
 
     QgsZonalStatistics( QgsVectorLayer *polygonLayer,
                         QgsRasterLayer *rasterLayer,
-                        const QString &attributePrefix = "",
+                        const QString &attributePrefix = QString(),
                         int rasterBand = 1,
                         QgsZonalStatistics::Statistics stats = QgsZonalStatistics::Statistics( QgsZonalStatistics::Count | QgsZonalStatistics::Sum | QgsZonalStatistics::Mean ) );
 %Docstring
@@ -64,6 +64,7 @@ class QgsZonalStatistics
 QFlags<QgsZonalStatistics::Statistic> operator|(QgsZonalStatistics::Statistic f1, QFlags<QgsZonalStatistics::Statistic> f2);
 
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/composer/qgsatlascomposition.sip b/python/core/composer/qgsatlascomposition.sip
@@ -171,7 +171,7 @@ class QgsAtlasComposition : QObject
  :rtype: str
 %End
 
-    void setFileFormat( QString format );
+    void setFileFormat( const QString &format );
 %Docstring
  Sets the  atlas file format used for image exports.
  \param format set the file format extension

diff --git a/python/core/diagram/qgshistogramdiagram.sip b/python/core/diagram/qgshistogramdiagram.sip
@@ -33,6 +33,7 @@ class QgsHistogramDiagram: QgsDiagram
 
     virtual QString diagramName() const;
 
+
 };
 
 

diff --git a/python/core/diagram/qgspiediagram.sip b/python/core/diagram/qgspiediagram.sip
@@ -31,6 +31,7 @@ class QgsPieDiagram: QgsDiagram
 
     virtual QString diagramName() const;
 
+
 };
 
 /************************************************************************

diff --git a/python/core/diagram/qgstextdiagram.sip b/python/core/diagram/qgstextdiagram.sip
@@ -44,6 +44,7 @@ class QgsTextDiagram: QgsDiagram
 
     virtual QString diagramName() const;
 
+
 };
 
 /************************************************************************

diff --git a/python/core/geometry/qgsabstractgeometry.sip b/python/core/geometry/qgsabstractgeometry.sip
@@ -528,6 +528,7 @@ struct QgsVertexId
 };
 
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgscircularstring.sip b/python/core/geometry/qgscircularstring.sip
@@ -136,6 +136,7 @@ class QgsCircularString: QgsCurve
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgscompoundcurve.sip b/python/core/geometry/qgscompoundcurve.sip
@@ -152,6 +152,7 @@ Appends first point if not already closed.
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgscurvepolygon.sip b/python/core/geometry/qgscurvepolygon.sip
@@ -199,6 +199,7 @@ Adds an interior ring to the geometry (takes ownership)
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgsgeometrycollection.sip b/python/core/geometry/qgsgeometrycollection.sip
@@ -190,6 +190,7 @@ Adds a geometry and takes ownership. Returns true in case of success.
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgslinestring.sip b/python/core/geometry/qgslinestring.sip
@@ -274,6 +274,7 @@ Closes the line string by appending the first point to the end of the line, if i
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgsmulticurve.sip b/python/core/geometry/qgsmulticurve.sip
@@ -57,6 +57,7 @@ Adds a geometry and takes ownership. Returns true in case of success
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgsmultilinestring.sip b/python/core/geometry/qgsmultilinestring.sip
@@ -56,6 +56,7 @@ Adds a geometry and takes ownership. Returns true in case of success
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgsmultipoint.sip b/python/core/geometry/qgsmultipoint.sip
@@ -57,6 +57,7 @@ Adds a geometry and takes ownership. Returns true in case of success
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgsmultipolygon.sip b/python/core/geometry/qgsmultipolygon.sip
@@ -59,6 +59,7 @@ Adds a geometry and takes ownership. Returns true in case of success
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgsmultisurface.sip b/python/core/geometry/qgsmultisurface.sip
@@ -51,6 +51,7 @@ Adds a geometry and takes ownership. Returns true in case of success
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/geometry/qgspoint.sip b/python/core/geometry/qgspoint.sip
@@ -412,6 +412,7 @@ class QgsPoint: QgsAbstractGeometry
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/processing/qgsprocessingalgorithm.sip b/python/core/processing/qgsprocessingalgorithm.sip
@@ -893,6 +893,7 @@ class QgsProcessingFeatureBasedAlgorithm : QgsProcessingAlgorithm
 
 
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/processing/qgsprocessingparameters.sip b/python/core/processing/qgsprocessingparameters.sip
@@ -2143,6 +2143,7 @@ class QgsProcessingParameterBand : QgsProcessingParameterDefinition
 
 
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip
@@ -778,6 +778,7 @@ Returns path to the build output directory. Valid only when running from build d
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsdatadefinedsizelegend.sip b/python/core/qgsdatadefinedsizelegend.sip
@@ -86,11 +86,11 @@ Returns transformer for scaling of symbol sizes. Returns null if no transformer
  :rtype: QgsSizeScaleTransformer
 %End
 
-    void setClasses( const QList<QgsDataDefinedSizeLegend::SizeClass> &classes );
+    void setClasses( const QList< QgsDataDefinedSizeLegend::SizeClass > &classes );
 %Docstring
 Sets list of classes: each class is a pair of symbol size (in units used by the symbol) and label
 %End
-    QList<QgsDataDefinedSizeLegend::SizeClass> classes() const;
+    QList< QgsDataDefinedSizeLegend::SizeClass > classes() const;
 %Docstring
 Returns list of classes: each class is a pair of symbol size (in units used by the symbol) and label
  :rtype: list of QgsDataDefinedSizeLegend.SizeClass

diff --git a/python/core/qgsfontutils.sip b/python/core/qgsfontutils.sip
@@ -204,6 +204,7 @@ class QgsFontUtils
 %End
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsmaprenderertask.sip b/python/core/qgsmaprenderertask.sip
@@ -80,6 +80,7 @@ class QgsMapRendererTask : QgsTask
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsprojectversion.sip b/python/core/qgsprojectversion.sip
@@ -75,6 +75,7 @@ class QgsProjectVersion
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsrenderchecker.sip b/python/core/qgsrenderchecker.sip
@@ -116,7 +116,7 @@ Get an md5 hash that uniquely identifies an image
  :rtype: bool
 %End
 
-    bool compareImages( const QString &testName, unsigned int mismatchCount = 0, const QString &renderedImageFile = "" );
+    bool compareImages( const QString &testName, unsigned int mismatchCount = 0, const QString &renderedImageFile = QString() );
 %Docstring
  Test using two arbitrary images (map renderer will not be used)
  \param testName - to be used as the basis for writing a file to

diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip
@@ -189,7 +189,7 @@ Sets coordinate transformation.
 
     void setRenderingStopped( bool stopped );
 
-    void setDistanceArea( const QgsDistanceArea distanceArea );
+    void setDistanceArea( const QgsDistanceArea &distanceArea );
 %Docstring
  A general purpose distance and area calculator, capable of performing ellipsoid based calculations.
  Will be used to convert meter distances to active MapUnit values for QgsUnitTypes.RenderMetersInMapUnits

diff --git a/python/core/qgsuserprofilemanager.sip b/python/core/qgsuserprofilemanager.sip
@@ -204,6 +204,7 @@ class QgsUserProfileManager : QObject
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -2093,6 +2093,7 @@ Set the extent
     QgsVectorLayer( const QgsVectorLayer &rhs );
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/qgsvirtuallayerdefinition.sip b/python/core/qgsvirtuallayerdefinition.sip
@@ -212,6 +212,7 @@ Convenient method to test if the geometry is defined (not NoGeometry and not Unk
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/raster/qgsrasterchecker.sip b/python/core/raster/qgsrasterchecker.sip
@@ -40,6 +40,7 @@ class QgsRasterChecker
 %End
 }; // class QgsRasterChecker
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/raster/qgsrasterdataprovider.sip b/python/core/raster/qgsrasterdataprovider.sip
@@ -467,6 +467,8 @@ Copy member variables from other raster data provider. Useful for implementation
 
 
 };
+
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/raster/qgsrasterlayer.sip b/python/core/raster/qgsrasterlayer.sip
@@ -452,6 +452,7 @@ Time stamp of data source in the moment when data/metadata were loaded by provid
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/raster/qgsrasterrenderer.sip b/python/core/raster/qgsrasterrenderer.sip
@@ -25,7 +25,10 @@ class QgsRasterRenderer : QgsRasterInterface
 
     static const QRgb NODATA_COLOR;
 
-    QgsRasterRenderer( QgsRasterInterface *input = 0, const QString &type = "" );
+    QgsRasterRenderer( QgsRasterInterface *input = 0, const QString &type = QString() );
+%Docstring
+ Constructor for QgsRasterRenderer.
+%End
     virtual ~QgsRasterRenderer();
 
 

diff --git a/python/core/symbology/qgscolorbrewerpalette.sip b/python/core/symbology/qgscolorbrewerpalette.sip
@@ -33,6 +33,7 @@ class QgsColorBrewerPalette
     static const char *BREWER_STRING;
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/symbology/qgscptcityarchive.sip b/python/core/symbology/qgscptcityarchive.sip
@@ -470,6 +470,7 @@ return index of a path
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/symbology/qgsellipsesymbollayer.sip b/python/core/symbology/qgsellipsesymbollayer.sip
@@ -181,6 +181,7 @@ class QgsEllipseSymbolLayer: QgsMarkerSymbolLayer
 
 
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/gui/qgsbusyindicatordialog.sip b/python/gui/qgsbusyindicatordialog.sip
@@ -22,7 +22,7 @@ class QgsBusyIndicatorDialog : QDialog
 %End
   public:
 
-    QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
+    QgsBusyIndicatorDialog( const QString &message = QString(), QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 %Docstring
  Constructor
  Modal busy indicator dialog with no buttons.
@@ -39,6 +39,7 @@ class QgsBusyIndicatorDialog : QDialog
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/gui/qgscodeeditor.sip b/python/gui/qgscodeeditor.sip
@@ -27,7 +27,7 @@ class QgsCodeEditor : QsciScintilla
 %End
   public:
 
-    QgsCodeEditor( QWidget *parent /TransferThis/ = 0, const QString &title = "", bool folding = false, bool margin = false );
+    QgsCodeEditor( QWidget *parent /TransferThis/ = 0, const QString &title = QString(), bool folding = false, bool margin = false );
 %Docstring
  Construct a new code editor.
 
@@ -90,6 +90,7 @@ class QgsCodeEditor : QsciScintilla
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/gui/qgscolorbutton.sip b/python/gui/qgscolorbutton.sip
@@ -35,7 +35,7 @@ class QgsColorButton : QToolButton
       SignalOnly
     };
 
-    QgsColorButton( QWidget *parent /TransferThis/ = 0, const QString &cdt = "", QgsColorSchemeRegistry *registry = 0 );
+    QgsColorButton( QWidget *parent /TransferThis/ = 0, const QString &cdt = QString(), QgsColorSchemeRegistry *registry = 0 );
 %Docstring
  Construct a new color ramp button.
  Use ``parent`` to attach a parent QWidget to the dialog.

diff --git a/python/gui/qgsexpressionbuilderdialog.sip b/python/gui/qgsexpressionbuilderdialog.sip
@@ -76,6 +76,7 @@ Sets geometry calculator used in distance/area calculations.
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/gui/qgsexpressionbuilderwidget.sip b/python/gui/qgsexpressionbuilderwidget.sip
@@ -180,7 +180,7 @@ Sets the expression string for the widget
 %End
 
     void registerItem( const QString &group, const QString &label, const QString &expressionText,
-                       const QString &helpText = "",
+                       const QString &helpText = QString(),
                        QgsExpressionItem::ItemType type = QgsExpressionItem::ExpressionNode,
                        bool highlightedItem = false, int sortOrder = 1 );
 %Docstring
@@ -299,6 +299,7 @@ Sets the expression string for the widget
 
 };
 
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *