Skip to content

Commit c49b5b7

Browse files
committed
Change a lot of arguments to const references in core/gui
Rationale: - there was a lot of large objects passed by value, so potentially there's a speed bump from this - even for implicitly shared classes like QString/QList there's still a (small) cost for copying the objects when there's no reason to - it's the right thing to do!
1 parent 33265e2 commit c49b5b7

721 files changed

Lines changed: 2288 additions & 2291 deletions

File tree

Some content is hidden

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

‎python/analysis/interpolation/qgsgridfilewriter.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class QgsGridFileWriter
55
%End
66

77
public:
8-
QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows, double cellSizeX, double cellSizeY );
8+
QgsGridFileWriter( QgsInterpolator* i, const QString& outputPath, const QgsRectangle& extent, int nCols, int nRows, double cellSizeX, double cellSizeY );
99
~QgsGridFileWriter();
1010

1111
/** Writes the grid file.

‎python/analysis/vector/qgspointsample.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class QgsPointSample
77
#include <qgspointsample.h>
88
%End
99
public:
10-
QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, QString nPointsAttribute, QString minDistAttribute = QString() );
10+
QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, const QString& nPointsAttribute, const QString& minDistAttribute = QString() );
1111
~QgsPointSample();
1212

1313
/** Starts calculation of random points

‎python/analysis/vector/qgstransectsample.sip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class QgsTransectSample
1616
StrataUnits //units are the same as stratum layer
1717
};
1818

19-
QgsTransectSample( QgsVectorLayer* strataLayer, QString strataIdAttribute, QString minDistanceAttribute, QString nPointsAttribute,
19+
QgsTransectSample( QgsVectorLayer* strataLayer, const QString& strataIdAttribute, const QString& minDistanceAttribute, const QString& nPointsAttribute,
2020
DistanceUnits minDistUnits, QgsVectorLayer* baselineLayer, bool shareBaseline,
21-
QString baselineStrataId, const QString& outputPointLayer, const QString& outputLineLayer, const QString& usedBaselineLayer,
21+
const QString& baselineStrataId, const QString& outputPointLayer, const QString& outputLineLayer, const QString& usedBaselineLayer,
2222
double minTransectLength = 0.0, double baselineBufferDistance = -1.0, double baselineSimplificationTolerance = -1.0 );
2323
~QgsTransectSample();
2424

‎python/analysis/vector/qgszonalstatistics.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsZonalStatistics
3131
typedef QFlags<QgsZonalStatistics::Statistic> Statistics;
3232

3333
QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = "", int rasterBand = 1,
34-
QgsZonalStatistics::Statistics stats = QgsZonalStatistics::Statistics( QgsZonalStatistics::Count | QgsZonalStatistics::Sum | QgsZonalStatistics::Mean) );
34+
const QgsZonalStatistics::Statistics& stats = QgsZonalStatistics::Statistics( QgsZonalStatistics::Count | QgsZonalStatistics::Sum | QgsZonalStatistics::Mean) );
3535
~QgsZonalStatistics();
3636

3737
/** Starts the calculation

‎python/core/auth/qgsauthcertutils.sip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ class QgsAuthCertUtils
4646
static QString getSslProtocolName( QSsl::SslProtocol protocol );
4747

4848

49-
static QMap< QString, QSslCertificate> mapDigestToCerts( QList<QSslCertificate> certs );
49+
static QMap< QString, QSslCertificate> mapDigestToCerts( const QList<QSslCertificate>& certs );
5050

5151

5252
// static QMap< QString, QList<QSslCertificate> > certsGroupedByOrg( QList<QSslCertificate> certs );
5353

5454

55-
static QMap< QString, QgsAuthConfigSslServer> mapDigestToSslConfigs( QList<QgsAuthConfigSslServer> configs );
55+
static QMap< QString, QgsAuthConfigSslServer> mapDigestToSslConfigs( const QList<QgsAuthConfigSslServer>& configs );
5656

5757

5858
// static QMap< QString, QList<QgsAuthConfigSslServer> > sslConfigsGroupedByOrg( QList<QgsAuthConfigSslServer> configs );

‎python/core/auth/qgsauthconfig.sip‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class QgsAuthMethodConfig
55
%End
66
public:
77

8-
QgsAuthMethodConfig( QString method = QString(), int version = 0 );
8+
QgsAuthMethodConfig( const QString& method = QString(), int version = 0 );
99

1010
QgsAuthMethodConfig( const QgsAuthMethodConfig& methodconfig );
1111

@@ -25,7 +25,7 @@ class QgsAuthMethodConfig
2525
void setUri( const QString& uri );
2626

2727
QString method() const;
28-
void setMethod( QString method );
28+
void setMethod( const QString& method );
2929

3030
int version() const;
3131
void setVersion( int version );
@@ -36,14 +36,14 @@ class QgsAuthMethodConfig
3636
void loadConfigString( const QString& configstr );
3737

3838
QgsStringMap configMap() const;
39-
void setConfigMap( QgsStringMap map );
39+
void setConfigMap( const QgsStringMap& map );
4040

4141
void setConfig( const QString &key, const QString &value );
4242
void setConfigList( const QString &key, const QStringList &value );
4343

4444
int removeConfig( const QString &key );
4545

46-
QString config( const QString &key , const QString defaultvalue = QString() ) const;
46+
QString config( const QString &key, const QString& defaultvalue = QString() ) const;
4747

4848
QStringList configList( const QString &key ) const;
4949

‎python/core/auth/qgsauthcrypto.sip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ class QgsAuthCrypto
77
public:
88
static bool isDisabled();
99

10-
static const QString encrypt( QString pass, QString cipheriv, QString text );
10+
static const QString encrypt( const QString& pass, const QString& cipheriv, const QString& text );
1111

12-
static const QString decrypt( QString pass, QString cipheriv, QString text );
12+
static const QString decrypt( const QString& pass, const QString& cipheriv, const QString& text );
1313

1414
static void passwordKeyHash( const QString &pass,
1515
QString *salt,

‎python/core/auth/qgsauthmanager.sip‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class QgsAuthManager : QObject
2424

2525
const QString authDbServersTable() const;
2626

27-
bool init( QString pluginPath = QString::null );
27+
bool init( const QString& pluginPath = QString::null );
2828

2929
bool isDisabled() const;
3030

@@ -107,9 +107,9 @@ class QgsAuthManager : QObject
107107

108108
////////////////// Generic settings ///////////////////////
109109

110-
bool storeAuthSetting( const QString& key, QVariant value, bool encrypt = false );
110+
bool storeAuthSetting( const QString& key, const QVariant& value, bool encrypt = false );
111111

112-
QVariant getAuthSetting( const QString& key, QVariant defaultValue = QVariant(), bool decrypt = false );
112+
QVariant getAuthSetting( const QString& key, const QVariant& defaultValue = QVariant(), bool decrypt = false );
113113

114114
bool existsAuthSetting( const QString& key );
115115

‎python/core/auth/qgsauthmethod.sip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class QgsAuthMethod : QObject
5050

5151
void setVersion( int version );
5252

53-
void setExpansions( QgsAuthMethod::Expansions expansions );
54-
void setDataProviders( QStringList dataproviders );
53+
void setExpansions( const QgsAuthMethod::Expansions& expansions );
54+
void setDataProviders( const QStringList& dataproviders );
5555
};
5656

5757
typedef QHash<QString, QgsAuthMethod*> QgsAuthMethodsMap;

‎python/core/composer/qgsatlascomposition.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public:
137137
QString featureFilterErrorString() const;
138138

139139
QString sortKeyAttributeName() const;
140-
void setSortKeyAttributeName( QString fieldName );
140+
void setSortKeyAttributeName( const QString& fieldName );
141141

142142
/** Returns the current list of predefined scales for the atlas. This is used
143143
* for maps which are set to the predefined atlas scaling mode.

0 commit comments

Comments
 (0)