Pass strings by const ref

nyalldawson · nyalldawson · commit b1745b0fea32 · 2017-09-13T05:47:19.000+10:00
diff --git a/src/core/geonode/qgsgeonoderequest.cpp b/src/core/geonode/qgsgeonoderequest.cpp
@@ -37,8 +37,6 @@ QgsGeoNodeRequest::QgsGeoNodeRequest( bool forceRefresh, QObject *parent )
 QgsGeoNodeRequest::QgsGeoNodeRequest( const QString &baseUrl, /*const QgsWmsAuthorization &auth,*/ bool forceRefresh, QObject *parent )
   : QObject( parent )
   , mBaseUrl( baseUrl )
-  , mGeoNodeReply( nullptr )
-  , mIsAborted( false )
   , mForceRefresh( forceRefresh )
 {
 
@@ -70,7 +68,7 @@ QList<QgsServiceLayerDetail> QgsGeoNodeRequest::getLayers()
   return parseLayers( this->response() );
 }
 
-QgsGeoNodeStyle QgsGeoNodeRequest::getDefaultStyle( QString layerName )
+QgsGeoNodeStyle QgsGeoNodeRequest::getDefaultStyle( const QString &layerName )
 {
   QgsGeoNodeStyle defaultStyle;
   bool success = request( QStringLiteral( "/api/layers?name=" )  + layerName );
@@ -94,7 +92,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::getDefaultStyle( QString layerName )
 
 }
 
-QList<QgsGeoNodeStyle> QgsGeoNodeRequest::getStyles( QString layerName )
+QList<QgsGeoNodeStyle> QgsGeoNodeRequest::getStyles( const QString &layerName )
 {
   QList<QgsGeoNodeStyle> geoNodeStyles;
   bool success = request( QStringLiteral( "/api/styles?layer__name=" ) + layerName );
@@ -122,7 +120,7 @@ QList<QgsGeoNodeStyle> QgsGeoNodeRequest::getStyles( QString layerName )
 
 }
 
-QgsGeoNodeStyle QgsGeoNodeRequest::getStyle( QString styleID )
+QgsGeoNodeStyle QgsGeoNodeRequest::getStyle( const QString &styleID )
 {
   QString endPoint = QStringLiteral( "/api/styles/" ) + styleID;
 
@@ -243,7 +241,7 @@ void QgsGeoNodeRequest::replyFinished()
 
 }
 
-QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( QByteArray layerResponse )
+QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( const QByteArray &layerResponse )
 {
   QList<QgsServiceLayerDetail> layers;
   if ( layerResponse.isEmpty() )
@@ -356,7 +354,7 @@ QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( QByteArray layerRes
   return layers;
 }
 
-QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( QString styleUrl )
+QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( const QString &styleUrl )
 {
   QgsGeoNodeStyle geoNodeStyle;
 
@@ -388,7 +386,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( QString styleUrl )
   return geoNodeStyle;
 }
 
-QStringList QgsGeoNodeRequest::serviceUrls( QString serviceType )
+QStringList QgsGeoNodeRequest::serviceUrls( const QString &serviceType )
 {
   QStringList urls;
 
@@ -432,7 +430,7 @@ QStringList QgsGeoNodeRequest::serviceUrls( QString serviceType )
   return urls;
 }
 
-QgsStringMap QgsGeoNodeRequest::serviceUrlData( QString serviceType )
+QgsStringMap QgsGeoNodeRequest::serviceUrlData( const QString &serviceType )
 {
   QgsStringMap urls;
 
@@ -478,7 +476,7 @@ QgsStringMap QgsGeoNodeRequest::serviceUrlData( QString serviceType )
   return urls;
 }
 
-bool QgsGeoNodeRequest::request( QString endPoint )
+bool QgsGeoNodeRequest::request( const QString &endPoint )
 {
   abort();
   mIsAborted = false;
diff --git a/src/core/geonode/qgsgeonoderequest.h b/src/core/geonode/qgsgeonoderequest.h
@@ -62,21 +62,21 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
     QgsGeoNodeRequest( const QString &baseUrl, /*const QgsWmsAuthorization &auth,*/ bool forceRefresh, QObject *parent = nullptr );
     virtual ~QgsGeoNodeRequest();
 
-    bool request( QString endPoint );
+    bool request( const QString &endPoint );
 
     QList<QgsServiceLayerDetail> getLayers();
 
-    QList<QgsGeoNodeStyle> getStyles( QString layerName );
+    QList<QgsGeoNodeStyle> getStyles( const QString &layerName );
 
-    QgsGeoNodeStyle getDefaultStyle( QString layerName );
+    QgsGeoNodeStyle getDefaultStyle( const QString &layerName );
 
-    QgsGeoNodeStyle getStyle( QString styleID );
+    QgsGeoNodeStyle getStyle( const QString &styleID );
 
     // Obtain list of unique URL in the geonode
-    QStringList serviceUrls( QString serviceType );
+    QStringList serviceUrls( const QString &serviceType );
 
     // Obtain map of layer name and url for a service type
-    QgsStringMap serviceUrlData( QString serviceType );
+    QgsStringMap serviceUrlData( const QString &serviceType );
 
     QString lastError() const { return mError; }
 
@@ -91,8 +91,8 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
     void setProtocol( const QString &protocol );
 
   private:
-    QList<QgsServiceLayerDetail> parseLayers( QByteArray layerResponse );
-    QgsGeoNodeStyle retrieveStyle( QString styleUrl );
+    QList<QgsServiceLayerDetail> parseLayers( const QByteArray &layerResponse );
+    QgsGeoNodeStyle retrieveStyle( const QString &styleUrl );
 
   signals:
     //! \brief emit a signal to be caught by qgisapp and display a statusQString on status bar
@@ -127,8 +127,8 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
     //! Response
     QByteArray mHttpGeoNodeResponse;
 
-    bool mIsAborted;
-    bool mForceRefresh;
+    bool mIsAborted = false;
+    bool mForceRefresh = false;
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ QgsGeoNodeRequest::QgsGeoNodeRequest( bool forceRefresh, QObject *parent )`
`37`	`37`	`QgsGeoNodeRequest::QgsGeoNodeRequest( const QString &baseUrl, /const QgsWmsAuthorization &auth,/ bool forceRefresh, QObject *parent )`
`38`	`38`	`: QObject( parent )`
`39`	`39`	`, mBaseUrl( baseUrl )`
`40`		`- , mGeoNodeReply( nullptr )`
`41`		`- , mIsAborted( false )`
`42`	`40`	`, mForceRefresh( forceRefresh )`
`43`	`41`	`{`
`44`	`42`
`@@ -70,7 +68,7 @@ QList<QgsServiceLayerDetail> QgsGeoNodeRequest::getLayers()`
`70`	`68`	`return parseLayers( this->response() );`
`71`	`69`	`}`
`72`	`70`
`73`		`-QgsGeoNodeStyle QgsGeoNodeRequest::getDefaultStyle( QString layerName )`
	`71`	`+QgsGeoNodeStyle QgsGeoNodeRequest::getDefaultStyle( const QString &layerName )`
`74`	`72`	`{`
`75`	`73`	`QgsGeoNodeStyle defaultStyle;`
`76`	`74`	`bool success = request( QStringLiteral( "/api/layers?name=" ) + layerName );`
`@@ -94,7 +92,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::getDefaultStyle( QString layerName )`
`94`	`92`
`95`	`93`	`}`
`96`	`94`
`97`		`-QList<QgsGeoNodeStyle> QgsGeoNodeRequest::getStyles( QString layerName )`
	`95`	`+QList<QgsGeoNodeStyle> QgsGeoNodeRequest::getStyles( const QString &layerName )`
`98`	`96`	`{`
`99`	`97`	`QList<QgsGeoNodeStyle> geoNodeStyles;`
`100`	`98`	`bool success = request( QStringLiteral( "/api/styles?layer__name=" ) + layerName );`
`@@ -122,7 +120,7 @@ QList<QgsGeoNodeStyle> QgsGeoNodeRequest::getStyles( QString layerName )`
`122`	`120`
`123`	`121`	`}`
`124`	`122`
`125`		`-QgsGeoNodeStyle QgsGeoNodeRequest::getStyle( QString styleID )`
	`123`	`+QgsGeoNodeStyle QgsGeoNodeRequest::getStyle( const QString &styleID )`
`126`	`124`	`{`
`127`	`125`	`QString endPoint = QStringLiteral( "/api/styles/" ) + styleID;`
`128`	`126`
`@@ -243,7 +241,7 @@ void QgsGeoNodeRequest::replyFinished()`
`243`	`241`
`244`	`242`	`}`
`245`	`243`
`246`		`-QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( QByteArray layerResponse )`
	`244`	`+QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( const QByteArray &layerResponse )`
`247`	`245`	`{`
`248`	`246`	`QList<QgsServiceLayerDetail> layers;`
`249`	`247`	`if ( layerResponse.isEmpty() )`
`@@ -356,7 +354,7 @@ QList<QgsServiceLayerDetail> QgsGeoNodeRequest::parseLayers( QByteArray layerRes`
`356`	`354`	`return layers;`
`357`	`355`	`}`
`358`	`356`
`359`		`-QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( QString styleUrl )`
	`357`	`+QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( const QString &styleUrl )`
`360`	`358`	`{`
`361`	`359`	`QgsGeoNodeStyle geoNodeStyle;`
`362`	`360`
`@@ -388,7 +386,7 @@ QgsGeoNodeStyle QgsGeoNodeRequest::retrieveStyle( QString styleUrl )`
`388`	`386`	`return geoNodeStyle;`
`389`	`387`	`}`
`390`	`388`
`391`		`-QStringList QgsGeoNodeRequest::serviceUrls( QString serviceType )`
	`389`	`+QStringList QgsGeoNodeRequest::serviceUrls( const QString &serviceType )`
`392`	`390`	`{`
`393`	`391`	`QStringList urls;`
`394`	`392`
`@@ -432,7 +430,7 @@ QStringList QgsGeoNodeRequest::serviceUrls( QString serviceType )`
`432`	`430`	`return urls;`
`433`	`431`	`}`
`434`	`432`
`435`		`-QgsStringMap QgsGeoNodeRequest::serviceUrlData( QString serviceType )`
	`433`	`+QgsStringMap QgsGeoNodeRequest::serviceUrlData( const QString &serviceType )`
`436`	`434`	`{`
`437`	`435`	`QgsStringMap urls;`
`438`	`436`
`@@ -478,7 +476,7 @@ QgsStringMap QgsGeoNodeRequest::serviceUrlData( QString serviceType )`
`478`	`476`	`return urls;`
`479`	`477`	`}`
`480`	`478`
`481`		`-bool QgsGeoNodeRequest::request( QString endPoint )`
	`479`	`+bool QgsGeoNodeRequest::request( const QString &endPoint )`
`482`	`480`	`{`
`483`	`481`	`abort();`
`484`	`482`	`mIsAborted = false;`