Skip to content

Commit 9502c35

Browse files
nyalldawsonnyalldawson
committed
Fix warnings when building without HAVE_SERVER_PYTHON_PLUGINS
1 parent 3b4dbe8 commit 9502c35

17 files changed

+68
-44
lines changed

‎src/server/services/wcs/qgswcsdescribecoverage.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ namespace QgsWcs
3333
void writeDescribeCoverage( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
3434
const QgsServerRequest &request, QgsServerResponse &response )
3535
{
36-
QgsAccessControl *accessControl = nullptr;
3736
#ifdef HAVE_SERVER_PYTHON_PLUGINS
38-
accessControl = serverIface->accessControls();
37+
QgsAccessControl *accessControl = serverIface->accessControls();
3938
#endif
4039
QDomDocument doc;
4140
const QDomDocument *describeDocument = nullptr;
4241

43-
QgsServerCacheManager *cacheManager = nullptr;
4442
#ifdef HAVE_SERVER_PYTHON_PLUGINS
45-
cacheManager = serverIface->cacheManager();
43+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
4644
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
4745
{
4846
describeDocument = &doc;
@@ -76,6 +74,8 @@ namespace QgsWcs
7674

7775
#ifdef HAVE_SERVER_PYTHON_PLUGINS
7876
QgsAccessControl *accessControl = serverIface->accessControls();
77+
#else
78+
( void )serverIface;
7979
#endif
8080

8181
//wcs:WCS_Capabilities element

‎src/server/services/wcs/qgswcsgetcapabilities.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,14 @@ namespace QgsWcs
3232
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
3333
const QgsServerRequest &request, QgsServerResponse &response )
3434
{
35-
QgsAccessControl *accessControl = nullptr;
3635
#ifdef HAVE_SERVER_PYTHON_PLUGINS
37-
accessControl = serverIface->accessControls();
36+
QgsAccessControl *accessControl = serverIface->accessControls();
3837
#endif
3938
QDomDocument doc;
4039
const QDomDocument *capabilitiesDocument = nullptr;
4140

42-
QgsServerCacheManager *cacheManager = nullptr;
4341
#ifdef HAVE_SERVER_PYTHON_PLUGINS
44-
cacheManager = serverIface->cacheManager();
42+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
4543
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
4644
{
4745
capabilitiesDocument = &doc;
@@ -274,6 +272,8 @@ namespace QgsWcs
274272
{
275273
#ifdef HAVE_SERVER_PYTHON_PLUGINS
276274
QgsAccessControl *accessControl = serverIface->accessControls();
275+
#else
276+
( void )serverIface;
277277
#endif
278278
/*
279279
* Adding layer list in ContentMetadata

‎src/server/services/wcs/qgswcsgetcoverage.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ namespace QgsWcs
5252

5353
#ifdef HAVE_SERVER_PYTHON_PLUGINS
5454
QgsAccessControl *accessControl = serverIface->accessControls();
55+
#else
56+
( void )serverIface;
5557
#endif
5658
//defining coverage name
5759
QString coveName;

‎src/server/services/wfs/qgswfsdescribefeaturetype.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@ namespace QgsWfs
3434
void writeDescribeFeatureType( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
3535
const QgsServerRequest &request, QgsServerResponse &response )
3636
{
37-
QgsAccessControl *accessControl = nullptr;
3837
#ifdef HAVE_SERVER_PYTHON_PLUGINS
39-
accessControl = serverIface->accessControls();
38+
QgsAccessControl *accessControl = serverIface->accessControls();
4039
#endif
4140
QDomDocument doc;
4241
const QDomDocument *describeDocument = nullptr;
4342

44-
QgsServerCacheManager *cacheManager = nullptr;
4543
#ifdef HAVE_SERVER_PYTHON_PLUGINS
46-
cacheManager = serverIface->cacheManager();
44+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
4745
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
4846
{
4947
describeDocument = &doc;
@@ -82,7 +80,11 @@ namespace QgsWfs
8280
throw QgsBadRequestException( QStringLiteral( "Invalid WFS Parameter" ),
8381
QStringLiteral( "OUTPUTFORMAT %1 is not supported" ).arg( wfsParameters.outputFormatAsString() ) );
8482

83+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
8584
QgsAccessControl *accessControl = serverIface->accessControls();
85+
#else
86+
( void )serverIface;
87+
#endif
8688

8789
//xsd:schema
8890
QDomElement schemaElement = doc.createElement( QStringLiteral( "schema" )/*xsd:schema*/ );

‎src/server/services/wfs/qgswfsgetcapabilities.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ namespace QgsWfs
3838
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
3939
const QgsServerRequest &request, QgsServerResponse &response )
4040
{
41-
QgsAccessControl *accessControl = nullptr;
4241
#ifdef HAVE_SERVER_PYTHON_PLUGINS
43-
accessControl = serverIface->accessControls();
42+
QgsAccessControl *accessControl = serverIface->accessControls();
4443
#endif
4544
QDomDocument doc;
4645
const QDomDocument *capabilitiesDocument = nullptr;
4746

48-
QgsServerCacheManager *cacheManager = nullptr;
4947
#ifdef HAVE_SERVER_PYTHON_PLUGINS
50-
cacheManager = serverIface->cacheManager();
48+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
5149
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5250
{
5351
capabilitiesDocument = &doc;
@@ -431,7 +429,11 @@ namespace QgsWfs
431429

432430
QDomElement getFeatureTypeListElement( QDomDocument &doc, QgsServerInterface *serverIface, const QgsProject *project )
433431
{
432+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
434433
QgsAccessControl *accessControl = serverIface->accessControls();
434+
#else
435+
( void )serverIface;
436+
#endif
435437

436438
//wfs:FeatureTypeList element
437439
QDomElement featureTypeListElement = doc.createElement( QStringLiteral( "FeatureTypeList" )/*wfs:FeatureTypeList*/ );

‎src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,14 @@ namespace QgsWfs
3939
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
4040
const QgsServerRequest &request, QgsServerResponse &response )
4141
{
42-
QgsAccessControl *accessControl = nullptr;
4342
#ifdef HAVE_SERVER_PYTHON_PLUGINS
44-
accessControl = serverIface->accessControls();
43+
QgsAccessControl *accessControl = serverIface->accessControls();
4544
#endif
4645
QDomDocument doc;
4746
const QDomDocument *capabilitiesDocument = nullptr;
4847

49-
QgsServerCacheManager *cacheManager = nullptr;
5048
#ifdef HAVE_SERVER_PYTHON_PLUGINS
51-
cacheManager = serverIface->cacheManager();
49+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
5250
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5351
{
5452
capabilitiesDocument = &doc;
@@ -269,7 +267,11 @@ namespace QgsWfs
269267

270268
QDomElement getFeatureTypeListElement( QDomDocument &doc, QgsServerInterface *serverIface, const QgsProject *project )
271269
{
270+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
272271
QgsAccessControl *accessControl = serverIface->accessControls();
272+
#else
273+
( void )serverIface;
274+
#endif
273275

274276
//wfs:FeatureTypeList element
275277
QDomElement featureTypeListElement = doc.createElement( QStringLiteral( "FeatureTypeList" )/*wfs:FeatureTypeList*/ );

‎src/server/services/wfs/qgswfsgetfeature.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,13 @@ namespace QgsWfs
177177
}
178178
}
179179

180-
QgsAccessControl *accessControl = serverIface->accessControls();
181-
182180
#ifdef HAVE_SERVER_PYTHON_PLUGINS
181+
QgsAccessControl *accessControl = serverIface->accessControls();
183182
//scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
184183
//there's LOTS of potential exit paths here, so we avoid having to restore the filters manually
185184
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() );
185+
#else
186+
( void )serverIface;
186187
#endif
187188

188189
// features counters

‎src/server/services/wfs/qgswfstransaction.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ namespace QgsWfs
214214

215215
void performTransaction( transactionRequest &aRequest, QgsServerInterface *serverIface, const QgsProject *project )
216216
{
217+
#ifndef HAVE_SERVER_PYTHON_PLUGINS
218+
( void )serverIface;
219+
#endif
217220
// store typeName
218221
QStringList typeNameList;
219222

@@ -239,8 +242,10 @@ namespace QgsWfs
239242
typeNameList << name;
240243
}
241244

245+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
242246
// get access controls
243247
QgsAccessControl *accessControl = serverIface->accessControls();
248+
#endif
244249

245250
//scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
246251
//there's LOTS of potential exit paths here, so we avoid having to restore the filters manually

‎src/server/services/wfs/qgswfstransaction_1_0_0.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,12 @@ namespace QgsWfs
225225
typeNameList << name;
226226
}
227227

228+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
228229
// get access controls
229230
QgsAccessControl *accessControl = serverIface->accessControls();
231+
#else
232+
( void )serverIface;
233+
#endif
230234

231235
//scoped pointer to restore all original layer filters (subsetStrings) when pointer goes out of scope
232236
//there's LOTS of potential exit paths here, so we avoid having to restore the filters manually

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

+2
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ namespace QgsWms
108108
// access control
109109
#ifdef HAVE_SERVER_PYTHON_PLUGINS
110110
QgsAccessControl *accessControl = serverIface->accessControls();
111+
#else
112+
( void )serverIface;
111113
#endif
112114
// Use layer ids
113115
bool useLayerIds = QgsServerProjectUtils::wmsUseLayerIds( *project );

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@ namespace QgsWms
9090
const QString &version, const QgsServerRequest &request,
9191
QgsServerResponse &response, bool projectSettings )
9292
{
93-
QgsAccessControl *accessControl = nullptr;
9493
#ifdef HAVE_SERVER_PYTHON_PLUGINS
95-
accessControl = serverIface->accessControls();
94+
QgsAccessControl *accessControl = serverIface->accessControls();
9695
#endif
9796

9897
QDomDocument doc;
@@ -112,9 +111,8 @@ namespace QgsWms
112111
#endif
113112
QString cacheKey = cacheKeyList.join( '-' );
114113

115-
QgsServerCacheManager *cacheManager = nullptr;
116114
#ifdef HAVE_SERVER_PYTHON_PLUGINS
117-
cacheManager = serverIface->cacheManager();
115+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
118116
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
119117
{
120118
capabilitiesDocument = &doc;
@@ -1671,7 +1669,11 @@ namespace QgsWms
16711669
void appendDrawingOrder( QDomDocument &doc, QDomElement &parentElem, QgsServerInterface *serverIface,
16721670
const QgsProject *project )
16731671
{
1672+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
16741673
QgsAccessControl *accessControl = serverIface->accessControls();
1674+
#else
1675+
( void )serverIface;
1676+
#endif
16751677
bool useLayerIds = QgsServerProjectUtils::wmsUseLayerIds( *project );
16761678
QStringList restrictedLayers = QgsServerProjectUtils::wmsRestrictedLayers( *project );
16771679

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,15 @@ namespace QgsWms
5454
const QString &version, const QgsServerRequest &request,
5555
QgsServerResponse &response )
5656
{
57-
QgsAccessControl *accessControl = nullptr;
5857
#ifdef HAVE_SERVER_PYTHON_PLUGINS
59-
accessControl = serverIface->accessControls();
58+
QgsAccessControl *accessControl = serverIface->accessControls();
6059
#endif
6160

6261
QDomDocument doc;
6362
const QDomDocument *contextDocument = nullptr;
6463

65-
QgsServerCacheManager *cacheManager = nullptr;
6664
#ifdef HAVE_SERVER_PYTHON_PLUGINS
67-
cacheManager = serverIface->cacheManager();
65+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
6866
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
6967
{
7068
contextDocument = &doc;

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,9 @@ namespace QgsWms
6464
}
6565

6666
// Get cached image
67-
QgsAccessControl *accessControl = nullptr;
68-
QgsServerCacheManager *cacheManager = nullptr;
6967
#ifdef HAVE_SERVER_PYTHON_PLUGINS
70-
accessControl = serverIface->accessControls();
71-
cacheManager = serverIface->cacheManager();
68+
QgsAccessControl *accessControl = serverIface->accessControls();
69+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
7270
if ( cacheManager )
7371
{
7472
QImage image;
@@ -88,14 +86,14 @@ namespace QgsWms
8886
if ( result )
8987
{
9088
writeImage( response, *result, format, context.imageQuality() );
89+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
9190
if ( cacheManager )
9291
{
9392
QByteArray content = response.data();
94-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
9593
if ( !content.isEmpty() )
9694
cacheManager->setCachedImage( &content, project, request, accessControl );
97-
#endif
9895
}
96+
#endif
9997
}
10098
else
10199
{

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

+4
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,11 @@ namespace QgsWms
132132
myDocument.appendChild( root );
133133

134134
// access control
135+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
135136
QgsAccessControl *accessControl = serverIface->accessControls();
137+
#else
138+
( void )serverIface;
139+
#endif
136140
// Use layer ids
137141
bool useLayerIds = QgsServerProjectUtils::wmsUseLayerIds( *project );
138142
// WMS restricted layers

‎src/server/services/wmts/qgswmtsgetcapabilities.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@ namespace QgsWmts
4040
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
4141
const QgsServerRequest &request, QgsServerResponse &response )
4242
{
43-
QgsAccessControl *accessControl = nullptr;
4443
#ifdef HAVE_SERVER_PYTHON_PLUGINS
45-
accessControl = serverIface->accessControls();
44+
QgsAccessControl *accessControl = serverIface->accessControls();
4645
#endif
4746
QDomDocument doc;
4847
const QDomDocument *capabilitiesDocument = nullptr;
4948

50-
QgsServerCacheManager *cacheManager = nullptr;
5149
#ifdef HAVE_SERVER_PYTHON_PLUGINS
52-
cacheManager = serverIface->cacheManager();
50+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
5351
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5452
{
5553
capabilitiesDocument = &doc;

‎src/server/services/wmts/qgswmtsgettile.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ namespace QgsWmts
3434
QUrlQuery query = translateWmtsParamToWmsQueryItem( QStringLiteral( "GetMap" ), params, project, serverIface );
3535

3636
// Get cached image
37-
QgsAccessControl *accessControl = nullptr;
38-
QgsServerCacheManager *cacheManager = nullptr;
3937
#ifdef HAVE_SERVER_PYTHON_PLUGINS
40-
accessControl = serverIface->accessControls();
41-
cacheManager = serverIface->cacheManager();
38+
QgsAccessControl *accessControl = serverIface->accessControls();
39+
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
4240
if ( cacheManager )
4341
{
4442
QgsWmtsParameters::Format f = params.format();

‎src/server/services/wmts/qgswmtsutils.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ namespace QgsWmts
366366
QList< layerDef > wmtsLayers;
367367
#ifdef HAVE_SERVER_PYTHON_PLUGINS
368368
QgsAccessControl *accessControl = serverIface->accessControls();
369+
#else
370+
( void )serverIface;
369371
#endif
370372

371373
// WMTS Project configuration
@@ -619,6 +621,10 @@ namespace QgsWmts
619621
QUrlQuery translateWmtsParamToWmsQueryItem( const QString &request, const QgsWmtsParameters &params,
620622
const QgsProject *project, QgsServerInterface *serverIface )
621623
{
624+
#ifndef HAVE_SERVER_PYTHON_PLUGINS
625+
( void )serverIface;
626+
#endif
627+
622628
//defining Layer
623629
QString layer = params.layer();
624630
//read Layer

0 commit comments

Comments
 (0)