Skip to content

Commit b7ddf71

Browse files
mhugentmhugent
committedApr 20, 2014
Remove legacy classes in server code
·
ltr-3_40archive/master_2
1 parent 8143039 commit b7ddf71

15 files changed

+16
-7700
lines changed
 

‎src/mapserver/qgis_map_serv.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
#include "qgsmaprenderer.h"
3232
#include "qgsmapserviceexception.h"
3333
#include "qgspallabeling.h"
34-
#include "qgsprojectparser.h"
35-
#include "qgssldparser.h"
3634
#include "qgsnetworkaccessmanager.h"
3735

3836
#include <QDomDocument>

‎src/mapserver/qgsconfigcache.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include "qgswmsprojectparser.h"
2222
#include "qgssldconfigparser.h"
2323

24+
#include <QFile>
25+
2426
QgsConfigCache* QgsConfigCache::instance()
2527
{
2628
static QgsConfigCache mInstance;

‎src/mapserver/qgsconfigparser.cpp

Lines changed: 0 additions & 606 deletions
This file was deleted.

‎src/mapserver/qgsconfigparser.h

Lines changed: 0 additions & 254 deletions
This file was deleted.

‎src/mapserver/qgsowsserver.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#ifndef QGSOWSSERVER_H
1919
#define QGSOWSSERVER_H
2020

21-
#include "qgsconfigparser.h"
2221
#include "qgsrequesthandler.h"
2322

2423
class QgsOWSServer

‎src/mapserver/qgsprojectparser.cpp

Lines changed: 0 additions & 4336 deletions
This file was deleted.

‎src/mapserver/qgsprojectparser.h

Lines changed: 0 additions & 321 deletions
This file was deleted.

‎src/mapserver/qgssldconfigparser.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
#include "qgsidwinterpolator.h"
4949
#include "qgstininterpolator.h"
5050

51+
#include <QTemporaryFile>
52+
5153
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
5254
#define TO8(x) (x).toUtf8().constData()
5355
#else

‎src/mapserver/qgssldconfigparser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
class QgsFeatureRendererV2;
2424
class QgsVectorLayer;
2525
class QgsRasterLayer;
26+
class QTemporaryFile;
2627

2728
class QgsSLDConfigParser: public QgsWMSConfigParser
2829
{

‎src/mapserver/qgssldparser.cpp

Lines changed: 0 additions & 2022 deletions
This file was deleted.

‎src/mapserver/qgssldparser.h

Lines changed: 0 additions & 153 deletions
This file was deleted.

‎src/mapserver/qgswcsserver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "qgslogger.h"
2525
#include "qgsmapserviceexception.h"
2626

27+
#include <QTemporaryFile>
2728
#include <QUrl>
2829

2930
#ifndef Q_WS_WIN

‎src/mapserver/qgswfsserver.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* *
1616
***************************************************************************/
1717
#include "qgswfsserver.h"
18-
#include "qgsconfigparser.h"
1918
#include "qgscrscache.h"
2019
#include "qgsfield.h"
2120
#include "qgsexpression.h"
@@ -34,7 +33,6 @@
3433
#include "qgsfilter.h"
3534
#include "qgslogger.h"
3635
#include "qgsmapserviceexception.h"
37-
#include "qgssldparser.h"
3836
#include "qgssymbolv2.h"
3937
#include "qgslegendmodel.h"
4038
#include "qgscomposerlegenditem.h"

‎src/mapserver/qgswmsconfigparser.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@
1818
#ifndef QGSWMSCONFIGPARSER_H
1919
#define QGSWMSCONFIGPARSER_H
2020

21-
#include "qgsconfigparser.h"
21+
#include "qgsmaprenderer.h"
22+
23+
class QgsComposerHtml;
24+
class QgsComposerLabel;
25+
class QgsComposerMap;
26+
class QgsComposition;
27+
class QgsMapLayer;
28+
2229

2330
class QgsWMSConfigParser
2431
{
@@ -68,7 +75,7 @@ class QgsWMSConfigParser
6875
virtual void drawOverlays( QPainter* p, int dpi, int width, int height ) const = 0;
6976

7077
//todo: fixme
71-
virtual void loadLabelSettings( QgsLabelingEngineInterface* lbl ) {} //= 0;
78+
virtual void loadLabelSettings( QgsLabelingEngineInterface* lbl ) { Q_UNUSED( lbl ); } //= 0;
7279

7380
virtual QString serviceUrl() const = 0;
7481

‎src/mapserver/qgswmsserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "qgswmsserver.h"
1919
#include "qgscapabilitiescache.h"
20-
#include "qgsconfigparser.h"
2120
#include "qgscrscache.h"
2221
#include "qgsfield.h"
2322
#include "qgsgeometry.h"
@@ -46,6 +45,7 @@
4645
#include <QImage>
4746
#include <QPainter>
4847
#include <QStringList>
48+
#include <QTemporaryFile>
4949
#include <QTextStream>
5050
#include <QDir>
5151

0 commit comments

Comments
 (0)
Please sign in to comment.