Skip to content
Permalink
Browse files

Remove unnecessary #include in server

  • Loading branch information
pblottiere authored and nyalldawson committed Jan 9, 2019
1 parent 2c8acf1 commit fcc3996ddf621607e97d5e185f59076fa57572eb
Showing with 3 additions and 163 deletions.
  1. +0 −1 python/server/auto_generated/qgsaccesscontrol.sip.in
  2. +0 −1 python/server/auto_generated/qgsbufferserverrequest.sip.in
  3. +0 −2 src/server/qgis_map_serv.cpp
  4. +0 −1 src/server/qgsaccesscontrol.cpp
  5. +0 −3 src/server/qgsaccesscontrol.h
  6. +0 −3 src/server/qgsaccesscontrolfilter.cpp
  7. +0 −2 src/server/qgsaccesscontrolfilter.h
  8. +0 −4 src/server/qgsbufferserverrequest.cpp
  9. +0 −4 src/server/qgsbufferserverrequest.h
  10. +0 −3 src/server/qgsbufferserverresponse.cpp
  11. +0 −1 src/server/qgsconfigcache.cpp
  12. +0 −1 src/server/qgsconfigcache.h
  13. +0 −3 src/server/qgsfcgiserverrequest.cpp
  14. +0 −1 src/server/qgsfcgiserverrequest.h
  15. +0 −4 src/server/qgsfcgiserverresponse.cpp
  16. +0 −1 src/server/qgsfilterrestorer.cpp
  17. +0 −6 src/server/qgsrequesthandler.cpp
  18. +0 −4 src/server/qgsrequesthandler.h
  19. +0 −5 src/server/qgsserver.cpp
  20. +0 −4 src/server/qgsserver.h
  21. +0 −1 src/server/qgsservercachefilter.h
  22. +0 −1 src/server/qgsservercachemanager.h
  23. +0 −7 src/server/qgsserverlogger.cpp
  24. +0 −1 src/server/qgsserverparameters.h
  25. +0 −2 src/server/qgsserverplugins.cpp
  26. +0 −1 src/server/qgsserverplugins.h
  27. +0 −2 src/server/qgsserversettings.cpp
  28. +0 −2 src/server/qgsservicenativeloader.cpp
  29. +0 −1 src/server/qgsserviceregistry.cpp
  30. +0 −3 src/server/services/wcs/qgswcsdescribecoverage.cpp
  31. +0 −1 src/server/services/wcs/qgswcsdescribecoverage.h
  32. +0 −5 src/server/services/wcs/qgswcsgetcapabilities.cpp
  33. +0 −8 src/server/services/wfs/qgswfsdescribefeaturetype.cpp
  34. +0 −3 src/server/services/wfs/qgswfsgetcapabilities.cpp
  35. +0 −4 src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp
  36. +0 −5 src/server/services/wfs/qgswfsgetfeature.cpp
  37. +0 −1 src/server/services/wfs/qgswfsparameters.cpp
  38. +0 −3 src/server/services/wfs/qgswfsparameters.h
  39. +0 −1 src/server/services/wfs/qgswfsutils.cpp
  40. +0 −3 src/server/services/wms/qgsdxfwriter.cpp
  41. +0 −1 src/server/services/wms/qgswms.cpp
  42. +1 −0 src/server/services/wms/qgswmsdescribelayer.cpp
  43. +0 −5 src/server/services/wms/qgswmsgetcapabilities.cpp
  44. +0 −1 src/server/services/wms/qgswmsgetcapabilities.h
  45. +0 −1 src/server/services/wms/qgswmsgetcontext.cpp
  46. +1 −0 src/server/services/wms/qgswmsgetstyles.cpp
  47. +0 −2 src/server/services/wms/qgswmsparameters.cpp
  48. +0 −2 src/server/services/wms/qgswmsparameters.h
  49. +0 −13 src/server/services/wms/qgswmsrenderer.cpp
  50. +0 −12 src/server/services/wms/qgswmsrenderer.h
  51. +1 −1 src/server/services/wms/qgswmsutils.cpp
  52. +0 −1 src/server/services/wms/qgswmsutils.h
  53. +0 −6 src/server/services/wmts/qgswmtsgetcapabilities.cpp
  54. +0 −2 src/server/services/wmts/qgswmtsgetfeatureinfo.cpp
  55. +0 −1 src/server/services/wmts/qgswmtsparameters.cpp
  56. +0 −2 src/server/services/wmts/qgswmtsparameters.h
  57. +0 −4 src/server/services/wmts/qgswmtsutils.cpp
@@ -12,7 +12,6 @@




class QgsAccessControl : QgsFeatureFilterProvider
{
%Docstring
@@ -8,7 +8,6 @@




class QgsBufferServerRequest : QgsServerRequest
{
%Docstring
@@ -19,8 +19,6 @@
//for CMAKE_INSTALL_PREFIX
#include "qgsconfig.h"
#include "qgsserver.h"
#include "qgslogger.h"
#include "qgsserverlogger.h"
#include "qgsfcgiserverresponse.h"
#include "qgsfcgiserverrequest.h"

@@ -20,7 +20,6 @@
#include "qgsmaplayer.h"
#include "qgsvectorlayer.h"

#include <QStringList>

void QgsAccessControl::resolveFilterFeatures( const QList<QgsMapLayer *> &layers )
{
@@ -21,14 +21,11 @@
#include "qgsfeaturefilterprovider.h"
#include "qgsaccesscontrolfilter.h"

#include <QMultiMap>
#include "qgis_server.h"
#include "qgis_sip.h"

SIP_IF_MODULE( HAVE_SERVER_PYTHON_PLUGINS )

class QgsAccessControlPlugin;


/**
* \ingroup server
@@ -22,9 +22,6 @@
#include "qgsmessagelog.h"
#include "qgsfeature.h"

#include <QString>
#include <QStringList>


//! Constructor
QgsAccessControlFilter::QgsAccessControlFilter( const QgsServerInterface *serverInterface ):
@@ -21,7 +21,6 @@
#define QGSACCESSCONTROLPLUGIN_H

#include <QMultiMap>
#include <QList>
#include <QString>
#include "qgis_server.h"
#include "qgis_sip.h"
@@ -31,7 +30,6 @@ SIP_IF_MODULE( HAVE_SERVER_PYTHON_PLUGINS )
class QgsServerInterface;
class QgsMapLayer;
class QgsVectorLayer;
class QgsExpression;
class QgsFeature;


@@ -18,10 +18,6 @@
***************************************************************************/

#include "qgsbufferserverrequest.h"
#include "qgslogger.h"
#include "qgsmessagelog.h"

#include <QDebug>

QgsBufferServerRequest::QgsBufferServerRequest( const QString &url, Method method, const QgsServerRequest::Headers &headers, QByteArray *data )
: QgsServerRequest( url, method, headers )
@@ -22,10 +22,6 @@
#include "qgis_server.h"
#include "qgsserverrequest.h"

#include <QBuffer>
#include <QByteArray>
#include <QMap>

/**
* \ingroup server
* \class QgsBufferServerRequest
@@ -18,11 +18,8 @@
***************************************************************************/

#include "qgsbufferserverresponse.h"
#include "qgslogger.h"
#include "qgsmessagelog.h"

#include <QDebug>

//
// QgsBufferServerResponse
//
@@ -17,7 +17,6 @@

#include "qgsconfigcache.h"
#include "qgsmessagelog.h"
#include "qgsaccesscontrol.h"

#include <QFile>

@@ -22,7 +22,6 @@

#include <QCache>
#include <QFileSystemWatcher>
#include <QMap>
#include <QObject>
#include <QDomDocument>

@@ -19,13 +19,10 @@

#include "qgis.h"
#include "qgsfcgiserverrequest.h"
#include "qgslogger.h"
#include "qgsserverlogger.h"
#include "qgsmessagelog.h"
#include <fcgi_stdio.h>

#include <QDebug>


QgsFcgiServerRequest::QgsFcgiServerRequest()
{
@@ -24,7 +24,6 @@

#include "qgsserverrequest.h"

#include <QBuffer>

/**
* \ingroup server
@@ -19,13 +19,9 @@

#include "qgis.h"
#include "qgsfcgiserverresponse.h"
#include "qgslogger.h"
#include "qgsserverlogger.h"
#include "qgsmessagelog.h"
#include <fcgi_stdio.h>

#include <QDebug>

//
// QgsFcgiServerResponse
//
@@ -18,7 +18,6 @@
#include "qgsfilterrestorer.h"
#include "qgsmessagelog.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"

#ifdef HAVE_SERVER_PYTHON_PLUGINS
#include "qgsaccesscontrol.h"
@@ -20,16 +20,10 @@
#include "qgis.h"
#include "qgsrequesthandler.h"
#include "qgsmessagelog.h"
#include "qgsserverexception.h"
#include "qgsserverrequest.h"
#include "qgsserverresponse.h"
#include <QBuffer>
#include <QByteArray>
#include <QDomDocument>
#include <QFile>
#include <QImage>
#include <QTextStream>
#include <QStringList>
#include <QUrl>
#include <QUrlQuery>

@@ -23,15 +23,11 @@
#include <QMap>
#include "qgis_sip.h"
#include <QString>
#include <QStringList>
#include <QPair>
#include <QColor>
#include <QHash>

#include "qgis_server.h"

class QDomDocument;
class QImage;
class QgsServerException;
class QgsServerRequest;
class QgsServerResponse;
@@ -21,7 +21,6 @@
//for CMAKE_INSTALL_PREFIX
#include "qgsconfig.h"
#include "qgsserver.h"
#include "qgsmapsettings.h"
#include "qgsauthmanager.h"
#include "qgscapabilitiescache.h"
#include "qgsfontutils.h"
@@ -33,16 +32,12 @@
#include "qgsnetworkaccessmanager.h"
#include "qgsserverlogger.h"
#include "qgsserverrequest.h"
#include "qgsbufferserverresponse.h"
#include "qgsbufferserverrequest.h"
#include "qgsfilterresponsedecorator.h"
#include "qgsservice.h"
#include "qgsserverprojectutils.h"
#include "qgsserverparameters.h"

#include <QDomDocument>
#include <QNetworkDiskCache>
#include <QImage>
#include <QSettings>
#include <QDateTime>

@@ -29,15 +29,11 @@

#include <QFileInfo>
#include "qgsrequesthandler.h"
#include "qgsapplication.h"
#include "qgsconfigcache.h"
#include "qgscapabilitiescache.h"
#include "qgsmapsettings.h"
#include "qgsmessagelog.h"
#include "qgsserviceregistry.h"
#include "qgsserversettings.h"
#include "qgsserverplugins.h"
#include "qgsserverfilter.h"
#include "qgsserverinterfaceimpl.h"
#include "qgis_server.h"
#include "qgsserverrequest.h"
@@ -22,7 +22,6 @@

#include <QMultiMap>
#include <QDomDocument>
#include <QObject>
#include "qgsserverrequest.h"
#include "qgis_server.h"
#include "qgis_sip.h"
@@ -23,7 +23,6 @@
#include "qgsaccesscontrol.h"
#include "qgsserverrequest.h"

#include <QMultiMap>
#include <QDomDocument>
#include "qgis_server.h"
#include "qgis_sip.h"
@@ -16,13 +16,6 @@
***************************************************************************/

#include "qgsserverlogger.h"
#include "qgsapplication.h"
#include <QCoreApplication>
#include <QFile>
#include <QTextStream>
#include <QTime>

#include <cstdlib>

QgsServerLogger *QgsServerLogger::sInstance = nullptr;

@@ -19,7 +19,6 @@
#define QGSSERVERPARAMETERS_H

#include <QMap>
#include <QObject>
#include <QMetaEnum>
#include <QUrlQuery>
#include <QColor>
@@ -17,11 +17,9 @@


#include "qgsserverplugins.h"
#include "qgsmapserviceexception.h"
#include "qgsapplication.h"
#include "qgslogger.h"
#include "qgspythonutils.h"
#include "qgsserverlogger.h"

#include <QLibrary>

@@ -21,7 +21,6 @@
#define SIP_NO_FILE


#include "qgsrequesthandler.h"
#include "qgsserverinterface.h"

// This is needed by SIP otherwise it doesn't find QgsPythonUtils header
@@ -21,8 +21,6 @@

#include <QSettings>

#include <iostream>

QgsServerSettings::QgsServerSettings()
{
load();
@@ -22,9 +22,7 @@
#include <QDebug>

#include "qgsservicenativeloader.h"
#include "qgsserviceregistry.h"
#include "qgsservicemodule.h"
#include "qgslogger.h"
#include "qgsmessagelog.h"
#include "qgis.h"

@@ -19,7 +19,6 @@

#include "qgsserviceregistry.h"
#include "qgsservice.h"
#include "qgslogger.h"
#include "qgsmessagelog.h"

#include <algorithm>
@@ -21,11 +21,8 @@
#include "qgswcsdescribecoverage.h"

#include "qgsproject.h"
#include "qgsexception.h"
#include "qgsmaplayer.h"
#include "qgsrasterlayer.h"
#include "qgsmapserviceexception.h"
#include "qgscoordinatereferencesystem.h"

namespace QgsWcs
{
@@ -19,7 +19,6 @@
#ifndef QGSWCSDESCRIBECOVERAGE_H
#define QGSWCSDESCRIBECOVERAGE_H

#include "qgsrasterlayer.h"

#include <QDomDocument>

@@ -21,12 +21,7 @@
#include "qgswcsgetcapabilities.h"

#include "qgsproject.h"
#include "qgsexception.h"
#include "qgsrasterlayer.h"
#include "qgsmapserviceexception.h"
#include "qgscoordinatereferencesystem.h"

#include <QStringList>

namespace QgsWcs
{
@@ -25,17 +25,9 @@
#include "qgswfsparameters.h"

#include "qgsproject.h"
#include "qgsexception.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"
#include "qgsmapserviceexception.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsfieldformatterregistry.h"
#include "qgsfieldformatter.h"
#include "qgsdatetimefieldformatter.h"

#include <QStringList>

namespace QgsWfs
{

@@ -27,11 +27,8 @@
#include "qgsexception.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"
#include "qgsmapserviceexception.h"
#include "qgscoordinatereferencesystem.h"

#include <QStringList>

namespace QgsWfs
{

0 comments on commit fcc3996

Please sign in to comment.
You can’t perform that action at this time.