Fix coding style

dmarteau · dmarteau · commit 609dd58d780c · 2017-01-10T14:34:17.000+01:00
diff --git a/src/server/qgsserverresponse.h b/src/server/qgsserverresponse.h
@@ -57,7 +57,7 @@ class SERVER_EXPORT QgsServerResponse
      * Send error
      * This method delegates error handling at the server level. This is different
      * from calling setReturnCode() wich let you return a specific response body.
-     * Calling sendError() will end the transaction and any attempt to write data 
+     * Calling sendError() will end the transaction and any attempt to write data
      * or set headers will be an error.
      * @param code HHTP return code value
      * @param message An informative error message
diff --git a/src/server/services/wms/qgsdxfwriter.cpp b/src/server/services/wms/qgsdxfwriter.cpp
@@ -46,7 +46,7 @@ namespace QgsWms
       return options;
     }
 
-    void readDxfLayerSettings( QgsWmsServer& server, QgsWmsConfigParser* configParser, 
+    void readDxfLayerSettings( QgsWmsServer& server, QgsWmsConfigParser* configParser,
                                QList< QPair<QgsVectorLayer *, int > >& layers,
                                const QMap<QString, QString>& options )
     {
diff --git a/src/server/services/wms/qgsfilterrestorer.h b/src/server/services/wms/qgsfilterrestorer.h
@@ -39,7 +39,7 @@ class QgsOWSServerFilterRestorer
     {
       restoreLayerFilters( mOriginalLayerFilters );
     }
-    
+
     void restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filterMap );
 
     /** Returns a reference to the object's hash of layers to original subsetString filters.
diff --git a/src/server/services/wms/qgswms.cpp b/src/server/services/wms/qgswms.cpp
@@ -71,8 +71,8 @@ namespace QgsWms
           return;
         }
 
-        if ( (QSTR_COMPARE( mVersion, "1.1.1" ) && QSTR_COMPARE( req, "capabilities" ))
-             || QSTR_COMPARE( req, "GetCapabilites" ) )
+        if (( QSTR_COMPARE( mVersion, "1.1.1" ) && QSTR_COMPARE( req, "capabilities" ) )
+            || QSTR_COMPARE( req, "GetCapabilites" ) )
         {
           //TODO GetCapabilities
           writeGetCapabilities( mServerIface, mVersion, request, response, false );
diff --git a/src/server/services/wms/qgswmsdescribelayer.cpp b/src/server/services/wms/qgswmsdescribelayer.cpp
@@ -28,7 +28,7 @@ namespace QgsWms
   void writeDescribeLayer( QgsServerInterface* serverIface, const QString& version,
                            const QgsServerRequest& request, QgsServerResponse& response )
   {
-    Q_UNUSED(version);
+    Q_UNUSED( version );
     QgsServerRequest::Parameters params = request.parameters();
     try
     {
diff --git a/src/server/services/wms/qgswmsgetfeatureinfo.cpp b/src/server/services/wms/qgswmsgetfeatureinfo.cpp
@@ -146,8 +146,8 @@ namespace QgsWms
     }
     else //unsupported format, set exception
     {
-      writeError( response,  QStringLiteral( "InvalidFormat" ), 
-                  QString("Feature info format '%1' is not supported. Possibilities are 'text/plain', 'text/html' or 'text/xml'." ).arg(infoFormat) );
+      writeError( response,  QStringLiteral( "InvalidFormat" ),
+                  QString( "Feature info format '%1' is not supported. Possibilities are 'text/plain', 'text/html' or 'text/xml'." ).arg( infoFormat ) );
       return;
     }
 
diff --git a/src/server/services/wms/qgswmsgetlegendgraphics.cpp b/src/server/services/wms/qgswmsgetlegendgraphics.cpp
@@ -40,7 +40,7 @@ namespace QgsWms
       QScopedPointer<QImage> result( server.getLegendGraphics() );
       if ( !result.isNull() )
       {
-        QString format = params.value( QStringLiteral("FORMAT"), QStringLiteral("PNG") );
+        QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
         writeImage( response, *result,  format, server.getImageQuality() );
       }
       else
diff --git a/src/server/services/wms/qgswmsgetmap.cpp b/src/server/services/wms/qgswmsgetmap.cpp
@@ -41,12 +41,12 @@ namespace QgsWms
       QScopedPointer<QImage> result( server.getMap() );
       if ( !result.isNull() )
       {
-        QString format = params.value( QStringLiteral("FORMAT"), QStringLiteral("PNG") );
+        QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
         writeImage( response, *result, format, server.getImageQuality() );
       }
       else
       {
-        writeError( response, QStringLiteral( "UnknownError" ), 
+        writeError( response, QStringLiteral( "UnknownError" ),
                     QStringLiteral( "Failed to compute GetMap image" ) );
       }
     }
diff --git a/src/server/services/wms/qgswmsgetprint.cpp b/src/server/services/wms/qgswmsgetprint.cpp
@@ -53,7 +53,7 @@ namespace QgsWms
         contentType = "image/svg+xml";
       }
       else if ( format.compare( QStringLiteral( "application/pdf" ), Qt::CaseInsensitive ) == 0 ||
-                  format.compare( QStringLiteral( "pdf" ), Qt::CaseInsensitive ) == 0 )
+                format.compare( QStringLiteral( "pdf" ), Qt::CaseInsensitive ) == 0 )
       {
         format = "pdf";
         contentType = "application/pdf";
diff --git a/src/server/services/wms/qgswmsservertransitional.cpp b/src/server/services/wms/qgswmsservertransitional.cpp
@@ -964,7 +964,7 @@ namespace QgsWms
 
     //scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
     //there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
-    QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer(mAccessControl) );
+    QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( mAccessControl ) );
 
     applyRequestedLayerFilters( layersList, mapSettings, filterRestorer->originalFilters() );
 
@@ -1125,7 +1125,7 @@ namespace QgsWms
 
     //scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
     //there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
-    QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer(mAccessControl) );
+    QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( mAccessControl ) );
 
     applyRequestedLayerFilters( layersList, mapSettings, filterRestorer->originalFilters() );
 
@@ -1308,7 +1308,7 @@ namespace QgsWms
 
     //scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
     //there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
-    QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer(mAccessControl) );
+    QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( mAccessControl ) );
     applyRequestedLayerFilters( layersList, mapSettings, filterRestorer->originalFilters() );
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
diff --git a/src/server/services/wms/qgswmsservertransitional.h b/src/server/services/wms/qgswmsservertransitional.h
@@ -257,7 +257,7 @@ namespace QgsWms
       //! Cleanup temporary objects (e.g. SLD parser objects or temporary files) after request
       void cleanupAfterRequest();
 
-    private: 
+    private:
 
       QMap<QString, QString> mParameters;
       bool mOwnsConfigParser; //delete config parser after request (e.g. sent SLD)
@@ -266,7 +266,7 @@ namespace QgsWms
       bool mDrawLegendLayerLabel;
       bool mDrawLegendItemLabel;
 
-       //! Map containing the WMS parameters
+      //! Map containing the WMS parameters
       QgsWmsConfigParser*    mConfigParser;
       QString                mConfigFilePath;
       //! The access control helper
diff --git a/src/server/services/wms/qgswmsutils.cpp b/src/server/services/wms/qgswmsutils.cpp
@@ -58,7 +58,7 @@ namespace QgsWms
     elem.appendChild( messageText );
     root.appendChild( elem );
 
-    response.setHeader( QStringLiteral("Content-Type"), QStringLiteral("text/xml; charset=utf-8") );
+    response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
     response.write( doc.toByteArray() );
   }
 
@@ -94,7 +94,8 @@ namespace QgsWms
   }
 
   //forward declaration
-  namespace {
+  namespace
+  {
     void medianCut( QVector<QRgb>& colorTable, int nColors, const QImage& inputImage );
   }
 
@@ -150,7 +151,7 @@ namespace QgsWms
     if ( outputFormat != UNKN )
     {
       response.setHeader( "Content-Type", contentType );
-      result.save( response.io(), qPrintable(saveFormat), imageQuality );
+      result.save( response.io(), qPrintable( saveFormat ), imageQuality );
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ namespace QgsWms`
`46`	`46`	`return options;`
`47`	`47`	`}`
`48`	`48`
`49`		`- void readDxfLayerSettings( QgsWmsServer& server, QgsWmsConfigParser* configParser,`
	`49`	`+ void readDxfLayerSettings( QgsWmsServer& server, QgsWmsConfigParser* configParser,`
`50`	`50`	`QList< QPair<QgsVectorLayer *, int > >& layers,`
`51`	`51`	`const QMap<QString, QString>& options )`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class QgsOWSServerFilterRestorer`
`39`	`39`	`{`
`40`	`40`	`restoreLayerFilters( mOriginalLayerFilters );`
`41`	`41`	`}`
`42`		`-`
	`42`	`+`
`43`	`43`	`void restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filterMap );`
`44`	`44`
`45`	`45`	`/** Returns a reference to the object's hash of layers to original subsetString filters.`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ namespace QgsWms`
`71`	`71`	`return;`
`72`	`72`	`}`
`73`	`73`
`74`		`- if ( (QSTR_COMPARE( mVersion, "1.1.1" ) && QSTR_COMPARE( req, "capabilities" ))`
`75`		`- \|\| QSTR_COMPARE( req, "GetCapabilites" ) )`
	`74`	`+ if (( QSTR_COMPARE( mVersion, "1.1.1" ) && QSTR_COMPARE( req, "capabilities" ) )`
	`75`	`+ \|\| QSTR_COMPARE( req, "GetCapabilites" ) )`
`76`	`76`	`{`
`77`	`77`	`//TODO GetCapabilities`
`78`	`78`	`writeGetCapabilities( mServerIface, mVersion, request, response, false );`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace QgsWms`
`28`	`28`	`void writeDescribeLayer( QgsServerInterface* serverIface, const QString& version,`
`29`	`29`	`const QgsServerRequest& request, QgsServerResponse& response )`
`30`	`30`	`{`
`31`		`- Q_UNUSED(version);`
	`31`	`+ Q_UNUSED( version );`
`32`	`32`	`QgsServerRequest::Parameters params = request.parameters();`
`33`	`33`	`try`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ namespace QgsWms`
`146`	`146`	`}`
`147`	`147`	`else //unsupported format, set exception`
`148`	`148`	`{`
`149`		`- writeError( response, QStringLiteral( "InvalidFormat" ),`
`150`		`- QString("Feature info format '%1' is not supported. Possibilities are 'text/plain', 'text/html' or 'text/xml'." ).arg(infoFormat) );`
	`149`	`+ writeError( response, QStringLiteral( "InvalidFormat" ),`
	`150`	`+ QString( "Feature info format '%1' is not supported. Possibilities are 'text/plain', 'text/html' or 'text/xml'." ).arg( infoFormat ) );`
`151`	`151`	`return;`
`152`	`152`	`}`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace QgsWms`
`40`	`40`	`QScopedPointer<QImage> result( server.getLegendGraphics() );`
`41`	`41`	`if ( !result.isNull() )`
`42`	`42`	`{`
`43`		`- QString format = params.value( QStringLiteral("FORMAT"), QStringLiteral("PNG") );`
	`43`	`+ QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );`
`44`	`44`	`writeImage( response, *result, format, server.getImageQuality() );`
`45`	`45`	`}`
`46`	`46`	`else`
Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ namespace QgsWms`
`41`	`41`	`QScopedPointer<QImage> result( server.getMap() );`
`42`	`42`	`if ( !result.isNull() )`
`43`	`43`	`{`
`44`		`- QString format = params.value( QStringLiteral("FORMAT"), QStringLiteral("PNG") );`
	`44`	`+ QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );`
`45`	`45`	`writeImage( response, *result, format, server.getImageQuality() );`
`46`	`46`	`}`
`47`	`47`	`else`
`48`	`48`	`{`
`49`		`- writeError( response, QStringLiteral( "UnknownError" ),`
	`49`	`+ writeError( response, QStringLiteral( "UnknownError" ),`
`50`	`50`	`QStringLiteral( "Failed to compute GetMap image" ) );`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ namespace QgsWms`
`53`	`53`	`contentType = "image/svg+xml";`
`54`	`54`	`}`
`55`	`55`	`else if ( format.compare( QStringLiteral( "application/pdf" ), Qt::CaseInsensitive ) == 0 \|\|`
`56`		`- format.compare( QStringLiteral( "pdf" ), Qt::CaseInsensitive ) == 0 )`
	`56`	`+ format.compare( QStringLiteral( "pdf" ), Qt::CaseInsensitive ) == 0 )`
`57`	`57`	`{`
`58`	`58`	`format = "pdf";`
`59`	`59`	`contentType = "application/pdf";`