sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused variable

Browse Source
This commit is contained in:
Matthias Kuhn 2018-01-03 15:14:42 +01:00
parent 7605fde911
commit 8b60b4c3c7
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/qgsfilterrestorer.h
View File

@ -35,9 +35,7 @@ class SERVER_EXPORT QgsOWSServerFilterRestorer
{
public:
QgsOWSServerFilterRestorer( const QgsAccessControl *accessControl )
: mAccessControl( accessControl )
{}
QgsOWSServerFilterRestorer() = default;
//! Destructor. When object is destroyed all original layer filters will be restored.
~QgsOWSServerFilterRestorer()
@ -72,7 +70,6 @@ class SERVER_EXPORT QgsOWSServerFilterRestorer
static void applyAccessControlLayerFilters( const QgsAccessControl *accessControl, QgsMapLayer *mapLayer );
private:
const QgsAccessControl *mAccessControl = nullptr;
QHash<QgsMapLayer *, QString> mOriginalLayerFilters;
};

2
src/server/services/wfs/qgswfsgetfeature.cpp
View File

@ -181,7 +181,7 @@ namespace QgsWfs
//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
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( accessControl ) );
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() );
// features counters
long sentFeatures = 0;

2
src/server/services/wfs/qgswfstransaction.cpp
View File

@ -239,7 +239,7 @@ namespace QgsWfs
//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
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( accessControl ) );
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() );
// get layers
QStringList wfsLayerIds = QgsServerProjectUtils::wfsLayerIds( *project );

2
src/server/services/wfs/qgswfstransaction_1_0_0.cpp
View File

@ -226,7 +226,7 @@ namespace QgsWfs
//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
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer( accessControl ) );
std::unique_ptr< QgsOWSServerFilterRestorer > filterRestorer( new QgsOWSServerFilterRestorer() );
// get layers
QStringList wfsLayerIds = QgsServerProjectUtils::wfsLayerIds( *project );

2
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -123,7 +123,9 @@ namespace QgsWms
const QgsProject *project,
const QgsServerRequest::Parameters &parameters )
: mParameters( parameters )
#ifdef HAVE_SERVER_PYTHON_PLUGINS
, mAccessControl( serverIface->accessControls() )
#endif
, mSettings( *serverIface->serverSettings() )
, mProject( project )
{

2
src/server/services/wms/qgswmsrenderer.h
View File

@ -286,8 +286,10 @@ namespace QgsWms
const QgsServerRequest::Parameters &mParameters;
#ifdef HAVE_SERVER_PYTHON_PLUGINS
//! The access control helper
QgsAccessControl *mAccessControl = nullptr;
#endif
QgsFeatureFilter mFeatureFilter;
const QgsServerSettings &mSettings;