[qt5 server] deprecate usage of QFtp and remove from Qt5 builds

m-kuhn · m-kuhn · commit 39047221ce43 · 2016-03-15T08:18:39.000+01:00
diff --git a/ci/travis/linux/qt5/install.sh b/ci/travis/linux/qt5/install.sh
@@ -34,6 +34,7 @@ cmake \
       -DWITH_QTWEBKIT=OFF \
       -DWITH_APIDOC=ON \
       -DWITH_ASTYLE=ON \
+      -DWITH_SERVER=ON \
       -DENABLE_QT5=ON \
       -DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
       -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so \
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -31,7 +31,6 @@ SET ( qgis_mapserv_SRCS
   qgswcsserver.cpp
   qgsmapserviceexception.cpp
   qgsmslayercache.cpp
-  qgsftptransaction.cpp
   qgsmslayerbuilder.cpp
   qgshostedvdsbuilder.cpp
   qgsinterpolationlayerbuilder.cpp
@@ -50,21 +49,32 @@ SET ( qgis_mapserv_SRCS
   qgssldconfigparser.cpp
   qgsconfigparserutils.cpp
   qgsserver.cpp
+)
+IF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
+  SET (qgis_mapserv_SRCS ${qgis_mapserv_SRCS}
+    qgsftptransaction.cpp
   )
+ENDIF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
+
 
 # SET (qgis_mapserv_UIS
 # none used
 # )
 
 SET (qgis_mapserv_MOC_HDRS
-  qgsftptransaction.h
   qgscapabilitiescache.h
   qgsconfigcache.h
   qgsmslayercache.h
   qgsserverlogger.h
   qgsserverstreamingdevice.h
 )
 
+IF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
+  SET (qgis_mapserv_MOC_HDRS ${qgis_mapserv_MOC_HDRS}
+    qgsftptransaction.h
+  )
+ENDIF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
+
 SET (qgis_mapserv_RCCS
   # not used
   #qgis_mapserv.qrc
diff --git a/src/server/qgsftptransaction.h b/src/server/qgsftptransaction.h
@@ -17,19 +17,22 @@
 
 #include <QFtp>
 
-/** A class for synchronous ftp access (using QFtp in background)*/
+/** A class for synchronous ftp access (using QFtp in background)
+ *
+ * @deprecated because of QFtp removal in Qt5.
+ */
 class QgsFtpTransaction: public QObject
 {
     Q_OBJECT
   public:
-    QgsFtpTransaction();
+    Q_DECL_DEPRECATED QgsFtpTransaction();
     ~QgsFtpTransaction();
 
     /** Transfers the file with the given Url and stores it into ba
        @param ftpUrl url of the file to access
        @param pointer to buffer to store file contents
        @return 0 in case of success*/
-    int get( const QString& ftpUrl, QByteArray& ba );
+    Q_DECL_DEPRECATED int get( const QString& ftpUrl, QByteArray& ba );
 
   public slots:
     void setFinishedFlag( bool error );
diff --git a/src/server/qgshttprequesthandler.cpp b/src/server/qgshttprequesthandler.cpp
@@ -17,9 +17,12 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgis.h"
 #include "qgshttprequesthandler.h"
+#if QT_VERSION < 0x050000
 #include "qgsftptransaction.h"
 #include "qgshttptransaction.h"
+#endif
 #include "qgsmessagelog.h"
 #include "qgsmapserviceexception.h"
 #include <QBuffer>
@@ -37,7 +40,7 @@ QgsHttpRequestHandler::QgsHttpRequestHandler( const bool captureOutput )
     : QgsRequestHandler()
 {
   mException = nullptr;
-  mHeadersSent = FALSE;
+  mHeadersSent = false;
   mCaptureOutput = captureOutput;
 }
 
@@ -165,7 +168,7 @@ void QgsHttpRequestHandler::sendHeaders()
   }
   addToResponseHeader( "\n" );
   mHeaders.clear();
-  mHeadersSent = TRUE;
+  mHeadersSent = true;
 }
 
 void QgsHttpRequestHandler::sendBody()
@@ -574,6 +577,7 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,
     }
     else if ( key.compare( "SLD", Qt::CaseInsensitive ) == 0 )
     {
+#if QT_VERSION < 0x050000
       QByteArray fileContents;
       if ( value.startsWith( "http", Qt::CaseInsensitive ) )
       {
@@ -585,18 +589,24 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,
       }
       else if ( value.startsWith( "ftp", Qt::CaseInsensitive ) )
       {
+        Q_NOWARN_DEPRECATED_PUSH;
         QgsFtpTransaction ftp;
         if ( !ftp.get( value, fileContents ) )
         {
           continue;
         }
         value = QUrl::fromPercentEncoding( fileContents );
+        Q_NOWARN_DEPRECATED_POP;
       }
       else
       {
         continue; //only http and ftp supported at the moment
       }
       value = QUrl::fromPercentEncoding( fileContents );
+#else
+      QgsMessageLog::logMessage( "http and ftp methods not supported with Qt5." );
+      continue;
+#endif
 
     }
     parameters.insert( key.toUpper(), value );
diff --git a/src/server/qgsremotedatasourcebuilder.cpp b/src/server/qgsremotedatasourcebuilder.cpp
@@ -15,9 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgis.h"
 #include "qgsremotedatasourcebuilder.h"
+#if QT_VERSION < 0x050000
 #include "qgsftptransaction.h"
 #include "qgshttptransaction.h"
+#endif
 #include "qgslogger.h"
 #include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"
@@ -161,6 +164,7 @@ QgsVectorLayer* QgsRemoteDataSourceBuilder::vectorLayerFromRemoteVDS( const QDom
 
 int QgsRemoteDataSourceBuilder::loadData( const QString& url, QByteArray& data ) const
 {
+#if QT_VERSION < 0x050000
   if ( url.startsWith( "http", Qt::CaseInsensitive ) )
   {
     QgsHttpTransaction http( url );
@@ -172,11 +176,18 @@ int QgsRemoteDataSourceBuilder::loadData( const QString& url, QByteArray& data )
   }
   else if ( url.startsWith( "ftp", Qt::CaseInsensitive ) )
   {
+    Q_NOWARN_DEPRECATED_PUSH;
     QgsFtpTransaction ftp;
     if ( ftp.get( url, data ) != 0 )
     {
       return 1;
     }
+    Q_NOWARN_DEPRECATED_POP;
   }
+#else
+  Q_UNUSED( url )
+  Q_UNUSED( data )
+  QgsDebugMsg( "http and ftp remote datasources not supported with Qt5" );
+#endif
   return 0;
 }
diff --git a/src/server/qgsremoteowsbuilder.cpp b/src/server/qgsremoteowsbuilder.cpp
@@ -17,7 +17,9 @@
 
 #include "qgsdatasourceuri.h"
 #include "qgsremoteowsbuilder.h"
+#if QT_VERSION < 0x050000
 #include "qgshttptransaction.h"
+#endif
 #include "qgslogger.h"
 #include "qgsmslayercache.h"
 #include "qgsrasterlayer.h"
@@ -239,6 +241,8 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wcsLayerFromUrl( const QString &url,
 {
   Q_UNUSED( layerName );
   Q_UNUSED( allowCaching );
+
+#if QT_VERSION < 0x050000
   QgsDebugMsg( "Entering" );
 
   //write server url and coverage name to a temporary file
@@ -339,7 +343,6 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wcsLayerFromUrl( const QString &url,
   wcsRequest += "&BBOX=" + bbox;
 
   QgsDebugMsg( "WCS request is: " + wcsRequest );
-
   //make request and store byte array into temporary file
   QgsHttpTransaction httpTransaction( wcsRequest );
   QByteArray result;
@@ -355,6 +358,14 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wcsLayerFromUrl( const QString &url,
   QgsRasterLayer* rl = new QgsRasterLayer( fileName, layerNameFromUri( fileName ) );
   layersToRemove.push_back( rl ); //make sure the layer gets deleted after each request
   return rl;
+#else
+  Q_UNUSED( url )
+  Q_UNUSED( filesToRemove )
+  Q_UNUSED( layersToRemove )
+  QgsDebugMsg( "remote http not supported with Qt5" );
+  return nullptr;
+#endif
+
 }
 
 QgsVectorLayer* QgsRemoteOWSBuilder::sosLayer( const QDomElement& remoteOWSElem, const QString& url, const QString& layerName, QList<QgsMapLayer*>& layersToRemove, bool allowCaching ) const
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -1403,7 +1403,7 @@ QList<QDomElement> QgsServerProjectParser::publishedComposerElements() const
   QDomElement wmsRestrictedComposersElem = propertiesElem.firstChildElement( "WMSRestrictedComposers" );
   if ( wmsRestrictedComposersElem.isNull() )
   {
-    for ( unsigned int i = 0; i < composerNodeList.length(); ++i )
+    for ( int i = 0; i < composerNodeList.size(); ++i )
     {
       composerElemList.push_back( composerNodeList.at( i ).toElement() );
     }

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,12 @@`
`17`	`17`	`* *`
`18`	`18`	`***************************************************************************/`
`19`	`19`
	`20`	`+#include "qgis.h"`
`20`	`21`	`#include "qgshttprequesthandler.h"`
	`22`	`+#if QT_VERSION < 0x050000`
`21`	`23`	`#include "qgsftptransaction.h"`
`22`	`24`	`#include "qgshttptransaction.h"`
	`25`	`+#endif`
`23`	`26`	`#include "qgsmessagelog.h"`
`24`	`27`	`#include "qgsmapserviceexception.h"`
`25`	`28`	`#include <QBuffer>`
`@@ -37,7 +40,7 @@ QgsHttpRequestHandler::QgsHttpRequestHandler( const bool captureOutput )`
`37`	`40`	`: QgsRequestHandler()`
`38`	`41`	`{`
`39`	`42`	`mException = nullptr;`
`40`		`- mHeadersSent = FALSE;`
	`43`	`+ mHeadersSent = false;`
`41`	`44`	`mCaptureOutput = captureOutput;`
`42`	`45`	`}`
`43`	`46`
`@@ -165,7 +168,7 @@ void QgsHttpRequestHandler::sendHeaders()`
`165`	`168`	`}`
`166`	`169`	`addToResponseHeader( "\n" );`
`167`	`170`	`mHeaders.clear();`
`168`		`- mHeadersSent = TRUE;`
	`171`	`+ mHeadersSent = true;`
`169`	`172`	`}`
`170`	`173`
`171`	`174`	`void QgsHttpRequestHandler::sendBody()`
`@@ -574,6 +577,7 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,`
`574`	`577`	`}`
`575`	`578`	`else if ( key.compare( "SLD", Qt::CaseInsensitive ) == 0 )`
`576`	`579`	`{`
	`580`	`+#if QT_VERSION < 0x050000`
`577`	`581`	`QByteArray fileContents;`
`578`	`582`	`if ( value.startsWith( "http", Qt::CaseInsensitive ) )`
`579`	`583`	`{`
`@@ -585,18 +589,24 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request,`
`585`	`589`	`}`
`586`	`590`	`else if ( value.startsWith( "ftp", Qt::CaseInsensitive ) )`
`587`	`591`	`{`
	`592`	`+ Q_NOWARN_DEPRECATED_PUSH;`
`588`	`593`	`QgsFtpTransaction ftp;`
`589`	`594`	`if ( !ftp.get( value, fileContents ) )`
`590`	`595`	`{`
`591`	`596`	`continue;`
`592`	`597`	`}`
`593`	`598`	`value = QUrl::fromPercentEncoding( fileContents );`
	`599`	`+ Q_NOWARN_DEPRECATED_POP;`
`594`	`600`	`}`
`595`	`601`	`else`
`596`	`602`	`{`
`597`	`603`	`continue; //only http and ftp supported at the moment`
`598`	`604`	`}`
`599`	`605`	`value = QUrl::fromPercentEncoding( fileContents );`
	`606`	`+#else`
	`607`	`+ QgsMessageLog::logMessage( "http and ftp methods not supported with Qt5." );`
	`608`	`+ continue;`
	`609`	`+#endif`
`600`	`610`
`601`	`611`	`}`
`602`	`612`	`parameters.insert( key.toUpper(), value );`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,12 @@`
`15`	`15`	`* *`
`16`	`16`	`***************************************************************************/`
`17`	`17`
	`18`	`+#include "qgis.h"`
`18`	`19`	`#include "qgsremotedatasourcebuilder.h"`
	`20`	`+#if QT_VERSION < 0x050000`
`19`	`21`	`#include "qgsftptransaction.h"`
`20`	`22`	`#include "qgshttptransaction.h"`
	`23`	`+#endif`
`21`	`24`	`#include "qgslogger.h"`
`22`	`25`	`#include "qgsrasterlayer.h"`
`23`	`26`	`#include "qgsvectorlayer.h"`
`@@ -161,6 +164,7 @@ QgsVectorLayer* QgsRemoteDataSourceBuilder::vectorLayerFromRemoteVDS( const QDom`
`161`	`164`
`162`	`165`	`int QgsRemoteDataSourceBuilder::loadData( const QString& url, QByteArray& data ) const`
`163`	`166`	`{`
	`167`	`+#if QT_VERSION < 0x050000`
`164`	`168`	`if ( url.startsWith( "http", Qt::CaseInsensitive ) )`
`165`	`169`	`{`
`166`	`170`	`QgsHttpTransaction http( url );`
`@@ -172,11 +176,18 @@ int QgsRemoteDataSourceBuilder::loadData( const QString& url, QByteArray& data )`
`172`	`176`	`}`
`173`	`177`	`else if ( url.startsWith( "ftp", Qt::CaseInsensitive ) )`
`174`	`178`	`{`
	`179`	`+ Q_NOWARN_DEPRECATED_PUSH;`
`175`	`180`	`QgsFtpTransaction ftp;`
`176`	`181`	`if ( ftp.get( url, data ) != 0 )`
`177`	`182`	`{`
`178`	`183`	`return 1;`
`179`	`184`	`}`
	`185`	`+ Q_NOWARN_DEPRECATED_POP;`
`180`	`186`	`}`
	`187`	`+#else`
	`188`	`+ Q_UNUSED( url )`
	`189`	`+ Q_UNUSED( data )`
	`190`	`+ QgsDebugMsg( "http and ftp remote datasources not supported with Qt5" );`
	`191`	`+#endif`
`181`	`192`	`return 0;`
`182`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1403,7 +1403,7 @@ QList<QDomElement> QgsServerProjectParser::publishedComposerElements() const`
`1403`	`1403`	`QDomElement wmsRestrictedComposersElem = propertiesElem.firstChildElement( "WMSRestrictedComposers" );`
`1404`	`1404`	`if ( wmsRestrictedComposersElem.isNull() )`
`1405`	`1405`	`{`
`1406`		`- for ( unsigned int i = 0; i < composerNodeList.length(); ++i )`
	`1406`	`+ for ( int i = 0; i < composerNodeList.size(); ++i )`
`1407`	`1407`	`{`
`1408`	`1408`	`composerElemList.push_back( composerNodeList.at( i ).toElement() );`
`1409`	`1409`	`}`