Skip to content

Commit ff3487d

Browse files
committed
Code quality changes and typo
1 parent ea519ff commit ff3487d

11 files changed

+13
-60
lines changed

src/server/qgsbufferserverresponse.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
QgsBufferServerResponse::QgsBufferServerResponse()
3131
{
3232
mBuffer.open( QIODevice::ReadWrite );
33-
mHeadersSent = false;
34-
mFinished = false;
35-
mReturnCode = 200;
3633
}
3734

3835
QgsBufferServerResponse::~QgsBufferServerResponse()

src/server/qgsbufferserverresponse.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
/**
3030
* \ingroup server
31-
* QgsBufferServerResponse
31+
* \class QgsBufferServerResponse
3232
* Class defining buffered response
3333
*/
3434
class QgsBufferServerResponse: public QgsServerResponse
@@ -79,9 +79,9 @@ class QgsBufferServerResponse: public QgsServerResponse
7979
QMap<QString, QString> mHeaders;
8080
QBuffer mBuffer;
8181
QByteArray mBody;
82-
bool mFinished;
83-
bool mHeadersSent;
84-
int mReturnCode;
82+
bool mFinished = false;
83+
bool mHeadersSent = false;
84+
int mReturnCode = 200;
8585
};
8686

8787
/**

src/server/qgsfilterresponsedecorator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/**
2626
* \ingroup server
27-
* QgsFilterResponseDecorator
27+
* \class QgsFilterResponseDecorator
2828
* Class defining decorator for calling filter's hooks
2929
*/
3030
class QgsFilterResponseDecorator: public QgsServerResponse
@@ -35,7 +35,7 @@ class QgsFilterResponseDecorator: public QgsServerResponse
3535
~QgsFilterResponseDecorator();
3636

3737
/**
38-
* Call flter's requestReady() method
38+
* Call filters requestReady() method
3939
*/
4040
void start();
4141

src/server/qgsrequesthandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,8 @@ void QgsRequestHandler::parseInput()
543543

544544
QDomDocument doc;
545545
QString errorMsg;
546-
int line;
547-
int column;
546+
int line = -1;
547+
int column = -1;
548548
if ( !doc.setContent( inputString, true, &errorMsg, &line, &column ) )
549549
{
550550
// XXX Output error but continue processing request ?

src/server/qgsserver.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -476,31 +476,6 @@ void QgsServer::handleRequest( QgsServerRequest& request, QgsServerResponse& res
476476
wfsServer.executeRequest();
477477
}
478478
}
479-
/*
480-
else if ( serviceString == QLatin1String( "WMS" ) )
481-
{
482-
QgsWmsConfigParser* p = QgsConfigCache::instance()->wmsConfiguration(
483-
configFilePath
484-
, accessControl
485-
);
486-
if ( !p )
487-
{
488-
theRequestHandler.setServiceException( QgsMapServiceException( QStringLiteral( "WMS configuration error" ), QStringLiteral( "There was an error reading the project file or the SLD configuration" ) ) );
489-
}
490-
else
491-
{
492-
QgsWmsServer wmsServer(
493-
configFilePath
494-
, parameterMap
495-
, p
496-
, &theRequestHandler
497-
, sCapabilitiesCache
498-
, accessControl
499-
);
500-
wmsServer.executeRequest();
501-
}
502-
}
503-
*/
504479
else
505480
{
506481
theRequestHandler.setServiceException( QgsMapServiceException( QStringLiteral( "Service configuration error" ), QStringLiteral( "Service unknown or unsupported" ) ) );

src/server/qgsserverrequest.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ QgsServerRequest::QgsServerRequest( const QUrl& url, Method method )
4444

4545
}
4646

47-
//! destructor
48-
QgsServerRequest::~QgsServerRequest()
49-
{
50-
51-
}
52-
5347
QString QgsServerRequest::getHeader( const QString& name ) const
5448
{
5549
Q_UNUSED( name );

src/server/qgsserverrequest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* Class defining request interface passed to services QgsService::executeRequest() method
3030
*/
3131

32-
// Note about design: this intreface must be passed along to python and thus signatures methods must be
32+
// Note about design: this interface must be passed along to python and thus signatures methods must be
3333
// compatible with pyQGIS/pyQT api and rules.
3434

3535
class SERVER_EXPORT QgsServerRequest
@@ -66,7 +66,7 @@ class SERVER_EXPORT QgsServerRequest
6666
QgsServerRequest( const QUrl& url, Method method = GetMethod );
6767

6868
//! destructor
69-
virtual ~QgsServerRequest();
69+
virtual ~QgsServerRequest() = default;
7070

7171
/**
7272
* @return the request url

src/server/qgsserverresponse.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ QgsServerResponse::QgsServerResponse()
2828
}
2929

3030

31-
//! destructor
32-
QgsServerResponse::~QgsServerResponse()
33-
{
34-
35-
}
36-
3731
void QgsServerResponse::write( const QString& data )
3832
{
3933
QIODevice* iodev = io();

src/server/qgsserverresponse.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SERVER_EXPORT QgsServerResponse
4242
QgsServerResponse();
4343

4444
//! destructor
45-
virtual ~QgsServerResponse();
45+
virtual ~QgsServerResponse() = default;
4646

4747
/**
4848
* Set Header entry
@@ -53,7 +53,7 @@ class SERVER_EXPORT QgsServerResponse
5353

5454
/**
5555
* Clear header
56-
* Undo a previous 'set_header' call
56+
* Undo a previous 'setHeader' call
5757
*/
5858
virtual void clearHeader( const QString& key ) = 0;
5959

src/server/qgsservice.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,3 @@ QgsService::QgsService()
2626

2727
}
2828

29-
//! Destructor
30-
QgsService::~QgsService()
31-
{
32-
33-
}
34-
35-

0 commit comments

Comments
 (0)