Remove unnecessary #include in server

qgis · Jan 9, 2019 · fcc3996 · fcc3996
1 parent 2c8acf1
commit fcc3996
Show file tree

Hide file tree

Showing 57 changed files with 3 additions and 163 deletions.
diff --git a/python/server/auto_generated/qgsaccesscontrol.sip.in b/python/server/auto_generated/qgsaccesscontrol.sip.in
@@ -12,7 +12,6 @@
 
 
 
-
 class QgsAccessControl : QgsFeatureFilterProvider
 {
 %Docstring

diff --git a/python/server/auto_generated/qgsbufferserverrequest.sip.in b/python/server/auto_generated/qgsbufferserverrequest.sip.in
@@ -8,7 +8,6 @@
 
 
 
-
 class QgsBufferServerRequest : QgsServerRequest
 {
 %Docstring

diff --git a/src/server/qgis_map_serv.cpp b/src/server/qgis_map_serv.cpp
@@ -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"
 

diff --git a/src/server/qgsaccesscontrol.cpp b/src/server/qgsaccesscontrol.cpp
@@ -20,7 +20,6 @@
 #include "qgsmaplayer.h"
 #include "qgsvectorlayer.h"
 
-#include <QStringList>
 
 void QgsAccessControl::resolveFilterFeatures( const QList<QgsMapLayer *> &layers )
 {

diff --git a/src/server/qgsaccesscontrol.h b/src/server/qgsaccesscontrol.h
@@ -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

diff --git a/src/server/qgsaccesscontrolfilter.cpp b/src/server/qgsaccesscontrolfilter.cpp
@@ -22,9 +22,6 @@
 #include "qgsmessagelog.h"
 #include "qgsfeature.h"
 
-#include <QString>
-#include <QStringList>
-
 
 //! Constructor
 QgsAccessControlFilter::QgsAccessControlFilter( const QgsServerInterface *serverInterface ):

diff --git a/src/server/qgsaccesscontrolfilter.h b/src/server/qgsaccesscontrolfilter.h
@@ -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;
 
 

diff --git a/src/server/qgsbufferserverrequest.cpp b/src/server/qgsbufferserverrequest.cpp
@@ -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 )

diff --git a/src/server/qgsbufferserverrequest.h b/src/server/qgsbufferserverrequest.h
@@ -22,10 +22,6 @@
 #include "qgis_server.h"
 #include "qgsserverrequest.h"
 
-#include <QBuffer>
-#include <QByteArray>
-#include <QMap>
-
 /**
  * \ingroup server
  * \class QgsBufferServerRequest

diff --git a/src/server/qgsbufferserverresponse.cpp b/src/server/qgsbufferserverresponse.cpp
@@ -18,11 +18,8 @@
  ***************************************************************************/
 
 #include "qgsbufferserverresponse.h"
-#include "qgslogger.h"
 #include "qgsmessagelog.h"
 
-#include <QDebug>
-
 //
 // QgsBufferServerResponse
 //

diff --git a/src/server/qgsconfigcache.cpp b/src/server/qgsconfigcache.cpp
@@ -17,7 +17,6 @@
 
 #include "qgsconfigcache.h"
 #include "qgsmessagelog.h"
-#include "qgsaccesscontrol.h"
 
 #include <QFile>
 

diff --git a/src/server/qgsconfigcache.h b/src/server/qgsconfigcache.h
@@ -22,7 +22,6 @@
 
 #include <QCache>
 #include <QFileSystemWatcher>
-#include <QMap>
 #include <QObject>
 #include <QDomDocument>
 

diff --git a/src/server/qgsfcgiserverrequest.cpp b/src/server/qgsfcgiserverrequest.cpp
@@ -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()
 {

diff --git a/src/server/qgsfcgiserverrequest.h b/src/server/qgsfcgiserverrequest.h
@@ -24,7 +24,6 @@
 
 #include "qgsserverrequest.h"
 
-#include <QBuffer>
 
 /**
  * \ingroup server

diff --git a/src/server/qgsfcgiserverresponse.cpp b/src/server/qgsfcgiserverresponse.cpp
@@ -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
 //

diff --git a/src/server/qgsfilterrestorer.cpp b/src/server/qgsfilterrestorer.cpp
@@ -18,7 +18,6 @@
 #include "qgsfilterrestorer.h"
 #include "qgsmessagelog.h"
 #include "qgsvectorlayer.h"
-#include "qgsvectordataprovider.h"
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
 #include "qgsaccesscontrol.h"

diff --git a/src/server/qgsrequesthandler.cpp b/src/server/qgsrequesthandler.cpp
@@ -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>
 

diff --git a/src/server/qgsrequesthandler.h b/src/server/qgsrequesthandler.h
@@ -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;

diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -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>
 

diff --git a/src/server/qgsserver.h b/src/server/qgsserver.h
@@ -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"

diff --git a/src/server/qgsservercachefilter.h b/src/server/qgsservercachefilter.h
@@ -22,7 +22,6 @@
 
 #include <QMultiMap>
 #include <QDomDocument>
-#include <QObject>
 #include "qgsserverrequest.h"
 #include "qgis_server.h"
 #include "qgis_sip.h"

diff --git a/src/server/qgsservercachemanager.h b/src/server/qgsservercachemanager.h
@@ -23,7 +23,6 @@
 #include "qgsaccesscontrol.h"
 #include "qgsserverrequest.h"
 
-#include <QMultiMap>
 #include <QDomDocument>
 #include "qgis_server.h"
 #include "qgis_sip.h"

diff --git a/src/server/qgsserverlogger.cpp b/src/server/qgsserverlogger.cpp
@@ -16,13 +16,6 @@
  ***************************************************************************/
 
 #include "qgsserverlogger.h"
-#include "qgsapplication.h"
-#include <QCoreApplication>
-#include <QFile>
-#include <QTextStream>
-#include <QTime>
-
-#include <cstdlib>
 
 QgsServerLogger *QgsServerLogger::sInstance = nullptr;
 

diff --git a/src/server/qgsserverparameters.h b/src/server/qgsserverparameters.h
@@ -19,7 +19,6 @@
 #define QGSSERVERPARAMETERS_H
 
 #include <QMap>
-#include <QObject>
 #include <QMetaEnum>
 #include <QUrlQuery>
 #include <QColor>

diff --git a/src/server/qgsserverplugins.cpp b/src/server/qgsserverplugins.cpp
@@ -17,11 +17,9 @@
 
 
 #include "qgsserverplugins.h"
-#include "qgsmapserviceexception.h"
 #include "qgsapplication.h"
 #include "qgslogger.h"
 #include "qgspythonutils.h"
-#include "qgsserverlogger.h"
 
 #include <QLibrary>
 

diff --git a/src/server/qgsserverplugins.h b/src/server/qgsserverplugins.h
@@ -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

diff --git a/src/server/qgsserversettings.cpp b/src/server/qgsserversettings.cpp
@@ -21,8 +21,6 @@
 
 #include <QSettings>
 
-#include <iostream>
-
 QgsServerSettings::QgsServerSettings()
 {
   load();

diff --git a/src/server/qgsservicenativeloader.cpp b/src/server/qgsservicenativeloader.cpp
@@ -22,9 +22,7 @@
 #include <QDebug>
 
 #include "qgsservicenativeloader.h"
-#include "qgsserviceregistry.h"
 #include "qgsservicemodule.h"
-#include "qgslogger.h"
 #include "qgsmessagelog.h"
 #include "qgis.h"
 

diff --git a/src/server/qgsserviceregistry.cpp b/src/server/qgsserviceregistry.cpp
@@ -19,7 +19,6 @@
 
 #include "qgsserviceregistry.h"
 #include "qgsservice.h"
-#include "qgslogger.h"
 #include "qgsmessagelog.h"
 
 #include <algorithm>

diff --git a/src/server/services/wcs/qgswcsdescribecoverage.cpp b/src/server/services/wcs/qgswcsdescribecoverage.cpp
@@ -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
 {

diff --git a/src/server/services/wcs/qgswcsdescribecoverage.h b/src/server/services/wcs/qgswcsdescribecoverage.h
@@ -19,7 +19,6 @@
 #ifndef QGSWCSDESCRIBECOVERAGE_H
 #define QGSWCSDESCRIBECOVERAGE_H
 
-#include "qgsrasterlayer.h"
 
 #include <QDomDocument>
 

diff --git a/src/server/services/wcs/qgswcsgetcapabilities.cpp b/src/server/services/wcs/qgswcsgetcapabilities.cpp
@@ -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
 {

diff --git a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp
@@ -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
 {
 

diff --git a/src/server/services/wfs/qgswfsgetcapabilities.cpp b/src/server/services/wfs/qgswfsgetcapabilities.cpp
@@ -27,11 +27,8 @@
 #include "qgsexception.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
-#include "qgsmapserviceexception.h"
 #include "qgscoordinatereferencesystem.h"
 
-#include <QStringList>
-
 namespace QgsWfs
 {