[QGIS Commit] r13461 - in trunk/qgis: python/core src/app src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-10 09:50:57 -0400 (Mon, 10 May 2010)
New Revision: 13461

Modified:
   trunk/qgis/python/core/qgsnetworkaccessmanager.sip
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/core/qgsnetworkaccessmanager.h
Log:
fix signal signature of QgsNetworkAccessManager::requestAboutToBeCreated

Modified: trunk/qgis/python/core/qgsnetworkaccessmanager.sip
===================================================================
--- trunk/qgis/python/core/qgsnetworkaccessmanager.sip	2010-05-10 13:21:54 UTC (rev 13460)
+++ trunk/qgis/python/core/qgsnetworkaccessmanager.sip	2010-05-10 13:50:57 UTC (rev 13461)
@@ -56,7 +56,7 @@
     void requestCreated( QNetworkReply * );
 
   protected:
-    virtual QNetworkReply *createRequest( Operation op, const QNetworkRequest & req, QIODevice * outgoingData = 0 );
+    virtual QNetworkReply *createRequest( Operation op, const QNetworkRequest & req, QIODevice *outgoingData = 0 );
     
   private:
     QgsNetworkAccessManager( QObject * );

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-05-10 13:21:54 UTC (rev 13460)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-05-10 13:50:57 UTC (rev 13461)
@@ -6529,8 +6529,10 @@
   connect( nam, SIGNAL( proxyAuthenticationRequired( const QNetworkProxy &, QAuthenticator * ) ),
            this, SLOT( namProxyAuthenticationRequired( const QNetworkProxy &, QAuthenticator * ) ) );
 
+#ifdef QT_OPENSSL
   connect( nam, SIGNAL( sslErrors( QNetworkReply *, const QList<QSslError> & ) ),
            this, SLOT( namSslErrors( QNetworkReply *, const QList<QSslError> & ) ) );
+#endif
 }
 
 void QgisApp::namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *auth )
@@ -6565,6 +6567,7 @@
   auth->setPassword( password );
 }
 
+#ifdef QT_OPENSSL
 void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors )
 {
   QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );
@@ -6589,6 +6592,7 @@
     reply->ignoreSslErrors();
   }
 }
+#endif
 
 void QgisApp::namUpdate()
 {

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2010-05-10 13:21:54 UTC (rev 13460)
+++ trunk/qgis/src/app/qgisapp.h	2010-05-10 13:50:57 UTC (rev 13461)
@@ -404,7 +404,9 @@
     //! request credentials for network manager
     void namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *auth );
     void namProxyAuthenticationRequired( const QNetworkProxy &proxy, QAuthenticator *auth );
+#ifdef QT_OPENSSL
     void namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors );
+#endif
 
   protected:
 

Modified: trunk/qgis/src/core/qgsnetworkaccessmanager.h
===================================================================
--- trunk/qgis/src/core/qgsnetworkaccessmanager.h	2010-05-10 13:21:54 UTC (rev 13460)
+++ trunk/qgis/src/core/qgsnetworkaccessmanager.h	2010-05-10 13:50:57 UTC (rev 13461)
@@ -74,11 +74,11 @@
     void setFallbackProxyAndExcludes( const QNetworkProxy &proxy, const QStringList &excludes );
 
   signals:
-    void requestAboutToBeCreated( Operation, const QNetworkRequest &, QIODevice * );
+    void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * );
     void requestCreated( QNetworkReply * );
 
   protected:
-    virtual QNetworkReply *createRequest( Operation op, const QNetworkRequest & req, QIODevice * outgoingData = 0 );
+    virtual QNetworkReply *createRequest( QNetworkAccessManager::Operation op, const QNetworkRequest & req, QIODevice * outgoingData = 0 );
 
   private:
     QgsNetworkAccessManager( QObject *parent = 0 );