Fixes compilation

qgis · Mar 22, 2019 · b0ef62b · b0ef62b
1 parent e57e85d
commit b0ef62b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 25 deletions.
diff --git a/python/server/auto_generated/qgsserverexception.sip.in b/python/server/auto_generated/qgsserverexception.sip.in
@@ -43,15 +43,6 @@ Formats the exception for sending to client
          - responseFormat: QString to store the content type of the response format.
 
 The default implementation returns text/xml format.
-%End
-
-    QByteArray formatResponse() const;
-%Docstring
-Formats the exception for sending to client
-
-:return: QByteArray The formatted response.
-
-.. versionadded:: 3.8
 %End
 
 };

diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -347,7 +347,8 @@ void QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &res
     catch ( QgsServerException &ex )
     {
       responseDecorator.write( ex );
-      QgsMessageLog::logMessage( ex.formatResponse(), QStringLiteral( "Server" ), Qgis::Info );
+      QString format;
+      QgsMessageLog::logMessage( ex.formatResponse( format ), QStringLiteral( "Server" ), Qgis::Info );
     }
     catch ( QgsException &ex )
     {

diff --git a/src/server/qgsserverexception.cpp b/src/server/qgsserverexception.cpp
@@ -27,12 +27,6 @@ QgsServerException::QgsServerException( const QString &message, int responseCode
 
 }
 
-QByteArray QgsServerException::formatResponse() const
-{
-  QString responseFormat;
-  return formatResponse( responseFormat );
-}
-
 QByteArray QgsServerException::formatResponse( QString &responseFormat ) const
 {
   QDomDocument doc;

diff --git a/src/server/qgsserverexception.h b/src/server/qgsserverexception.h
@@ -58,15 +58,6 @@ class SERVER_EXPORT QgsServerException
      */
     virtual QByteArray formatResponse( QString &responseFormat SIP_OUT ) const;
 
-    /**
-     * Formats the exception for sending to client
-     *
-     * \returns QByteArray The formatted response.
-     *
-     * \since QGIS 3.8
-     */
-    QByteArray formatResponse() const;
-
   private:
     int mResponseCode;
 };