Skip to content

Commit 311a24a

Browse files
authored
Merge pull request #5166 from nyalldawson/tidy
clang-tidy fixes
2 parents 6772541 + 9b04589 commit 311a24a

File tree

613 files changed

+845
-2072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

613 files changed

+845
-2072
lines changed

python/analysis/network/qgsgraph.sip

+4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ class QgsGraph
107107
#include "qgsgraph.h"
108108
%End
109109
public:
110+
110111
QgsGraph();
112+
%Docstring
113+
Constructor for QgsGraph.
114+
%End
111115

112116

113117
int addVertex( const QgsPointXY &pt );

python/core/diagram/qgsdiagram.sip

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class QgsDiagram
1919
#include "qgsdiagram.h"
2020
%End
2121
public:
22+
2223
virtual ~QgsDiagram();
2324

2425
virtual QgsDiagram *clone() const = 0 /Factory/;
@@ -71,7 +72,11 @@ Returns the size in map units the diagram will use to render. Interpolate size
7172
%End
7273

7374
protected:
75+
7476
QgsDiagram();
77+
%Docstring
78+
Constructor for QgsDiagram.
79+
%End
7580
QgsDiagram( const QgsDiagram &other );
7681

7782
void setPenWidth( QPen &pen, const QgsDiagramSettings &s, const QgsRenderContext &c );

python/core/fieldformatter/qgsvaluerelationfieldformatter.sip

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ class QgsValueRelationFieldFormatter : QgsFieldFormatter
3535
typedef QVector < QgsValueRelationFieldFormatter::ValueRelationItem > ValueRelationCache;
3636

3737
QgsValueRelationFieldFormatter();
38+
%Docstring
39+
Constructor for QgsValueRelationFieldFormatter.
40+
%End
3841

3942
virtual QString id() const;
4043

python/core/gps/qgsgpsconnectionregistry.sip

+4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ class QgsGPSConnectionRegistry
2525
#include "qgsgpsconnectionregistry.h"
2626
%End
2727
public:
28+
2829
QgsGPSConnectionRegistry();
30+
%Docstring
31+
Constructor for QgsGPSConnectionRegistry.
32+
%End
2933
~QgsGPSConnectionRegistry();
3034

3135

python/core/gps/qgsgpsdconnection.sip

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class QgsGpsdConnection: QgsNMEAConnection
2121
%End
2222
public:
2323
QgsGpsdConnection( const QString &host, qint16 port, const QString &device );
24-
~QgsGpsdConnection();
2524

2625
};
2726

python/core/gps/qgsnmeaconnection.sip

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class QgsNMEAConnection: QgsGPSConnection
2020
%End
2121
public:
2222
QgsNMEAConnection( QIODevice *dev );
23-
~QgsNMEAConnection();
2423

2524
protected slots:
2625
virtual void parseData();

python/core/gps/qgsqtlocationconnection.sip

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class QgsQtLocationConnection: QgsGPSConnection
2828
%End
2929
public:
3030
QgsQtLocationConnection();
31-
~QgsQtLocationConnection();
3231

3332
protected slots:
3433
void broadcastConnectionAvailable();

python/core/qgscolorscheme.sip

+3
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,9 @@ class QgsProjectColorScheme : QgsColorScheme
286286
public:
287287

288288
QgsProjectColorScheme();
289+
%Docstring
290+
Constructor for QgsProjectColorScheme.
291+
%End
289292

290293
virtual QString schemeName() const;
291294

python/core/qgscredentials.sip

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ class QgsCredentials
3030
public:
3131

3232
virtual ~QgsCredentials();
33+
%Docstring
34+
Destructor.
35+
%End
3336

3437
bool get( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() );
3538
%Docstring
@@ -70,7 +73,11 @@ retrieves instance
7073
%End
7174

7275
protected:
76+
7377
QgsCredentials();
78+
%Docstring
79+
Constructor for QgsCredentials.
80+
%End
7481

7582
virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ) = 0;
7683
%Docstring

python/core/qgsdatadefinedsizelegend.sip

+4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ class QgsDataDefinedSizeLegend
2525
#include "qgsdatadefinedsizelegend.h"
2626
%End
2727
public:
28+
2829
QgsDataDefinedSizeLegend();
30+
%Docstring
31+
Constructor for QgsDataDefinedSizeLegend.
32+
%End
2933

3034
QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
3135
%Docstring

python/core/qgsdiagramrenderer.sip

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212

1313

14-
1514
class QgsDiagramLayerSettings
1615
{
1716
%Docstring

python/core/qgsexpressionfieldbuffer.sip

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ class QgsExpressionFieldBuffer
3131
};
3232

3333
QgsExpressionFieldBuffer();
34+
%Docstring
35+
Constructor for QgsExpressionFieldBuffer.
36+
%End
3437

3538
void addExpression( const QString &exp, const QgsField &fld );
3639
%Docstring

python/core/qgsgmlschema.sip

+4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ class QgsGmlFeatureClass
1818
#include "qgsgmlschema.h"
1919
%End
2020
public:
21+
2122
QgsGmlFeatureClass();
23+
%Docstring
24+
Constructor for QgsGmlFeatureClass.
25+
%End
2226
QgsGmlFeatureClass( const QString &name, const QString &path );
2327

2428
QList<QgsField> &fields();

python/core/qgsjsonutils.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class QgsJsonUtils
248248
%End
249249

250250
static QString exportAttributes( const QgsFeature &feature, QgsVectorLayer *layer = 0,
251-
QVector<QVariant> attributeWidgetCaches = QVector<QVariant>() );
251+
const QVector<QVariant> &attributeWidgetCaches = QVector<QVariant>() );
252252
%Docstring
253253
Exports all attributes from a QgsFeature as a JSON map type.
254254
\param feature feature to export

python/core/qgslabelsearchtree.sip

+4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ class QgsLabelSearchTree
2020
#include "qgslabelsearchtree.h"
2121
%End
2222
public:
23+
2324
QgsLabelSearchTree();
25+
%Docstring
26+
Constructor for QgsLabelSearchTree.
27+
%End
2428
~QgsLabelSearchTree();
2529

2630

python/core/qgsmaprenderertask.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class QgsMapRendererTask : QgsTask
4848
Adds ``annotations`` to be rendered on the map.
4949
%End
5050

51-
void addDecorations( QList< QgsMapDecoration * > decorations );
51+
void addDecorations( const QList<QgsMapDecoration *> &decorations );
5252
%Docstring
5353
Adds ``decorations`` to be rendered on the map.
5454
%End

python/core/qgsobjectcustomproperties.sip

+4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ class QgsObjectCustomProperties
2323
#include "qgsobjectcustomproperties.h"
2424
%End
2525
public:
26+
2627
QgsObjectCustomProperties();
28+
%Docstring
29+
Constructor for QgsObjectCustomProperties.
30+
%End
2731

2832
QStringList keys() const;
2933
%Docstring

python/core/qgspluginlayerregistry.sip

+3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ class QgsPluginLayerRegistry
6868
public:
6969

7070
QgsPluginLayerRegistry();
71+
%Docstring
72+
Constructor for QgsPluginLayerRegistry.
73+
%End
7174
~QgsPluginLayerRegistry();
7275

7376

python/core/qgspropertycollection.sip

+3
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,9 @@ class QgsPropertyCollectionStack : QgsAbstractPropertyCollection
368368
public:
369369

370370
QgsPropertyCollectionStack();
371+
%Docstring
372+
Constructor for QgsPropertyCollectionStack.
373+
%End
371374

372375
~QgsPropertyCollectionStack();
373376

python/core/qgspropertytransformer.sip

-10
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,6 @@ class QgsGenericNumericTransformer : QgsPropertyTransformer
339339
\param exponent optional exponential for non-linear scaling
340340
%End
341341

342-
QgsGenericNumericTransformer( const QgsGenericNumericTransformer &other );
343-
%Docstring
344-
Copy constructor.
345-
%End
346-
347342
virtual Type transformerType() const;
348343
virtual QgsGenericNumericTransformer *clone() const /Factory/;
349344
virtual QVariant toVariant() const;
@@ -475,11 +470,6 @@ class QgsSizeScaleTransformer : QgsPropertyTransformer
475470
\param exponent exponent for Exponential scaling method
476471
%End
477472

478-
QgsSizeScaleTransformer( const QgsSizeScaleTransformer &other );
479-
%Docstring
480-
Copy constructor.
481-
%End
482-
483473
virtual Type transformerType() const;
484474
virtual QgsSizeScaleTransformer *clone() const /Factory/;
485475
virtual QVariant toVariant() const;

python/core/qgsreadwritecontext.sip

+4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ class QgsReadWriteContext
2020
#include "qgsreadwritecontext.h"
2121
%End
2222
public:
23+
2324
QgsReadWriteContext();
25+
%Docstring
26+
Constructor for QgsReadWriteContext.
27+
%End
2428

2529
const QgsPathResolver &pathResolver() const;
2630
%Docstring

python/core/qgssettings.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Returns a list of all key top-level groups (same as childGroups) but only for gr
166166
Return the path to the Global Settings QSettings storage file
167167
:rtype: str
168168
%End
169-
static bool setGlobalSettingsPath( QString path );
169+
static bool setGlobalSettingsPath( const QString &path );
170170
%Docstring
171171
Set the Global Settings QSettings storage file
172172
:rtype: bool

python/core/qgstrackedvectorlayertools.sip

+4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ class QgsTrackedVectorLayerTools : QgsVectorLayerTools
1414
#include "qgstrackedvectorlayertools.h"
1515
%End
1616
public:
17+
1718
QgsTrackedVectorLayerTools();
19+
%Docstring
20+
Constructor for QgsTrackedVectorLayerTools.
21+
%End
1822

1923
virtual bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap &defaultValues, const QgsGeometry &defaultGeometry, QgsFeature *feature ) const;
2024

python/core/raster/qgsbilinearrasterresampler.sip

+4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ Bilinear Raster Resampler
2020
#include "qgsbilinearrasterresampler.h"
2121
%End
2222
public:
23+
2324
QgsBilinearRasterResampler();
25+
%Docstring
26+
Constructor for QgsBilinearRasterResampler.
27+
%End
2428

2529
virtual void resample( const QImage &srcImage, QImage &dstImage );
2630

python/core/raster/qgsrasterpipe.sip

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ class QgsRasterPipe
3434
};
3535

3636
QgsRasterPipe();
37+
%Docstring
38+
Constructor for QgsRasterPipe.
39+
%End
40+
3741

3842
~QgsRasterPipe();
3943

python/core/raster/qgsrastertransparency.sip

+10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ class QgsRasterTransparency
1919
#include "qgsrastertransparency.h"
2020
%End
2121
public:
22+
2223
QgsRasterTransparency();
24+
%Docstring
25+
Constructor for QgsRasterTransparency.
26+
%End
2327

2428
struct TransparentThreeValuePixel
2529
{
@@ -87,8 +91,14 @@ True if there are no entries in the pixel lists except the nodata value
8791
%End
8892

8993
void writeXml( QDomDocument &doc, QDomElement &parentElem ) const;
94+
%Docstring
95+
Writes the transparency information to an XML document.
96+
%End
9097

9198
void readXml( const QDomElement &elem );
99+
%Docstring
100+
Reads the transparency information from an XML document.
101+
%End
92102

93103
};
94104
/************************************************************************

python/core/symbology/qgscategorizedsymbolrenderer.sip

-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
7878
public:
7979

8080
QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() );
81-
~QgsCategorizedSymbolRenderer();
8281

8382
virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context );
8483
virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context );

python/core/symbology/qgssinglesymbolrenderer.sip

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer
1717
public:
1818

1919
QgsSingleSymbolRenderer( QgsSymbol *symbol /Transfer/ );
20-
~QgsSingleSymbolRenderer();
2120

2221
virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context );
2322
virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context );

python/gui/attributetable/qgsfeaturelistmodel.sip

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel
3434

3535
public:
3636
explicit QgsFeatureListModel( QgsAttributeTableFilterModel *sourceModel, QObject *parent /TransferThis/ = 0 );
37-
virtual ~QgsFeatureListModel();
3837

3938
virtual void setSourceModel( QgsAttributeTableFilterModel *sourceModel );
4039
QgsVectorLayerCache *layerCache();

python/gui/attributetable/qgsfieldconditionalformatwidget.sip

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class QgsFieldConditionalFormatWidget : QWidget
2828
\param parent parent widget
2929
%End
3030

31-
~QgsFieldConditionalFormatWidget();
32-
3331
void viewRules();
3432
%Docstring
3533
Switches the widget to the rules page.

python/gui/qgsfiledownloader.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QgsFileDownloader : QObject
3232
%End
3333
public:
3434

35-
QgsFileDownloader( const QUrl &url, const QString &outputFileName, bool guiNotificationsEnabled = true, QString authcfg = QString() );
35+
QgsFileDownloader( const QUrl &url, const QString &outputFileName, bool guiNotificationsEnabled = true, const QString &authcfg = QString() );
3636
%Docstring
3737
QgsFileDownloader
3838
\param url the download url

python/gui/qgssourceselectproviderregistry.sip

+4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ class QgsSourceSelectProviderRegistry
3030
#include "qgssourceselectproviderregistry.h"
3131
%End
3232
public:
33+
3334
QgsSourceSelectProviderRegistry();
35+
%Docstring
36+
Constructor for QgsSourceSelectProviderRegistry.
37+
%End
3438

3539
~QgsSourceSelectProviderRegistry();
3640

python/gui/symbology/qgssvgselectorwidget.sip

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ class QgsSvgSelectorWidget : QWidget
7575
%End
7676
public:
7777
QgsSvgSelectorWidget( QWidget *parent /TransferThis/ = 0 );
78-
~QgsSvgSelectorWidget();
7978

8079
QString currentSvgPath() const;
8180
%Docstring

python/gui/symbology/qgssymbolwidgetcontext.sip

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ class QgsSymbolWidgetContext
2626
public:
2727

2828
QgsSymbolWidgetContext();
29+
%Docstring
30+
Constructor for QgsSymbolWidgetContext.
31+
%End
2932

3033
QgsSymbolWidgetContext( const QgsSymbolWidgetContext &other );
3134
%Docstring

0 commit comments

Comments
 (0)