Skip to content

Commit 609dd58

Browse files
dmarteaudmarteau
committedJan 10, 2017
Fix coding style
·
ltr-3_40final-3_0_0
1 parent a0ee81b commit 609dd58

12 files changed

+21
-20
lines changed
 

‎src/server/qgsserverresponse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class SERVER_EXPORT QgsServerResponse
5757
* Send error
5858
* This method delegates error handling at the server level. This is different
5959
* from calling setReturnCode() wich let you return a specific response body.
60-
* Calling sendError() will end the transaction and any attempt to write data
60+
* Calling sendError() will end the transaction and any attempt to write data
6161
* or set headers will be an error.
6262
* @param code HHTP return code value
6363
* @param message An informative error message

‎src/server/services/wms/qgsdxfwriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace QgsWms
4646
return options;
4747
}
4848

49-
void readDxfLayerSettings( QgsWmsServer& server, QgsWmsConfigParser* configParser,
49+
void readDxfLayerSettings( QgsWmsServer& server, QgsWmsConfigParser* configParser,
5050
QList< QPair<QgsVectorLayer *, int > >& layers,
5151
const QMap<QString, QString>& options )
5252
{

‎src/server/services/wms/qgsfilterrestorer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class QgsOWSServerFilterRestorer
3939
{
4040
restoreLayerFilters( mOriginalLayerFilters );
4141
}
42-
42+
4343
void restoreLayerFilters( const QHash<QgsMapLayer*, QString>& filterMap );
4444

4545
/** Returns a reference to the object's hash of layers to original subsetString filters.

‎src/server/services/wms/qgswms.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ namespace QgsWms
7171
return;
7272
}
7373

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" ) )
7676
{
7777
//TODO GetCapabilities
7878
writeGetCapabilities( mServerIface, mVersion, request, response, false );

‎src/server/services/wms/qgswmsdescribelayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace QgsWms
2828
void writeDescribeLayer( QgsServerInterface* serverIface, const QString& version,
2929
const QgsServerRequest& request, QgsServerResponse& response )
3030
{
31-
Q_UNUSED(version);
31+
Q_UNUSED( version );
3232
QgsServerRequest::Parameters params = request.parameters();
3333
try
3434
{

‎src/server/services/wms/qgswmsgetfeatureinfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ namespace QgsWms
146146
}
147147
else //unsupported format, set exception
148148
{
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 ) );
151151
return;
152152
}
153153

‎src/server/services/wms/qgswmsgetlegendgraphics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace QgsWms
4040
QScopedPointer<QImage> result( server.getLegendGraphics() );
4141
if ( !result.isNull() )
4242
{
43-
QString format = params.value( QStringLiteral("FORMAT"), QStringLiteral("PNG") );
43+
QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
4444
writeImage( response, *result, format, server.getImageQuality() );
4545
}
4646
else

‎src/server/services/wms/qgswmsgetmap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ namespace QgsWms
4141
QScopedPointer<QImage> result( server.getMap() );
4242
if ( !result.isNull() )
4343
{
44-
QString format = params.value( QStringLiteral("FORMAT"), QStringLiteral("PNG") );
44+
QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
4545
writeImage( response, *result, format, server.getImageQuality() );
4646
}
4747
else
4848
{
49-
writeError( response, QStringLiteral( "UnknownError" ),
49+
writeError( response, QStringLiteral( "UnknownError" ),
5050
QStringLiteral( "Failed to compute GetMap image" ) );
5151
}
5252
}

‎src/server/services/wms/qgswmsgetprint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace QgsWms
5353
contentType = "image/svg+xml";
5454
}
5555
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 )
5757
{
5858
format = "pdf";
5959
contentType = "application/pdf";

‎src/server/services/wms/qgswmsservertransitional.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ namespace QgsWms
964964

965965
//scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
966966
//there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
967-
QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer(mAccessControl) );
967+
QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( mAccessControl ) );
968968

969969
applyRequestedLayerFilters( layersList, mapSettings, filterRestorer->originalFilters() );
970970

@@ -1125,7 +1125,7 @@ namespace QgsWms
11251125

11261126
//scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
11271127
//there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
1128-
QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer(mAccessControl) );
1128+
QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( mAccessControl ) );
11291129

11301130
applyRequestedLayerFilters( layersList, mapSettings, filterRestorer->originalFilters() );
11311131

@@ -1308,7 +1308,7 @@ namespace QgsWms
13081308

13091309
//scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
13101310
//there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
1311-
QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer(mAccessControl) );
1311+
QScopedPointer< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( mAccessControl ) );
13121312
applyRequestedLayerFilters( layersList, mapSettings, filterRestorer->originalFilters() );
13131313

13141314
#ifdef HAVE_SERVER_PYTHON_PLUGINS

‎src/server/services/wms/qgswmsservertransitional.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ namespace QgsWms
257257
//! Cleanup temporary objects (e.g. SLD parser objects or temporary files) after request
258258
void cleanupAfterRequest();
259259

260-
private:
260+
private:
261261

262262
QMap<QString, QString> mParameters;
263263
bool mOwnsConfigParser; //delete config parser after request (e.g. sent SLD)
@@ -266,7 +266,7 @@ namespace QgsWms
266266
bool mDrawLegendLayerLabel;
267267
bool mDrawLegendItemLabel;
268268

269-
//! Map containing the WMS parameters
269+
//! Map containing the WMS parameters
270270
QgsWmsConfigParser* mConfigParser;
271271
QString mConfigFilePath;
272272
//! The access control helper

‎src/server/services/wms/qgswmsutils.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace QgsWms
5858
elem.appendChild( messageText );
5959
root.appendChild( elem );
6060

61-
response.setHeader( QStringLiteral("Content-Type"), QStringLiteral("text/xml; charset=utf-8") );
61+
response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
6262
response.write( doc.toByteArray() );
6363
}
6464

@@ -94,7 +94,8 @@ namespace QgsWms
9494
}
9595

9696
//forward declaration
97-
namespace {
97+
namespace
98+
{
9899
void medianCut( QVector<QRgb>& colorTable, int nColors, const QImage& inputImage );
99100
}
100101

@@ -150,7 +151,7 @@ namespace QgsWms
150151
if ( outputFormat != UNKN )
151152
{
152153
response.setHeader( "Content-Type", contentType );
153-
result.save( response.io(), qPrintable(saveFormat), imageQuality );
154+
result.save( response.io(), qPrintable( saveFormat ), imageQuality );
154155
}
155156
else
156157
{

0 commit comments

Comments
 (0)
Please sign in to comment.