fix signal signature of QgsNetworkAccessManager::requestAboutToBeCreated

jef · jef · commit 4b9ca010fdab · 2010-05-10T13:50:57.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13461 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgsnetworkaccessmanager.sip b/python/core/qgsnetworkaccessmanager.sip
@@ -56,7 +56,7 @@ class QgsNetworkAccessManager : QNetworkAccessManager
     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 * );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6529,8 +6529,10 @@ void QgisApp::namSetup()
   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 @@ void QgisApp::namProxyAuthenticationRequired( const QNetworkProxy &proxy, QAuthe
   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 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
     reply->ignoreSslErrors();
   }
 }
+#endif
 
 void QgisApp::namUpdate()
 {
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -404,7 +404,9 @@ class QgisApp : public QMainWindow
     //! 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:
 
diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h
@@ -74,11 +74,11 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
     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 );

Original file line number	Diff line number	Diff line change
`@@ -6529,8 +6529,10 @@ void QgisApp::namSetup()`
`6529`	`6529`	`connect( nam, SIGNAL( proxyAuthenticationRequired( const QNetworkProxy &, QAuthenticator * ) ),`
`6530`	`6530`	`this, SLOT( namProxyAuthenticationRequired( const QNetworkProxy &, QAuthenticator * ) ) );`
`6531`	`6531`
	`6532`	`+#ifdef QT_OPENSSL`
`6532`	`6533`	`connect( nam, SIGNAL( sslErrors( QNetworkReply *, const QList<QSslError> & ) ),`
`6533`	`6534`	`this, SLOT( namSslErrors( QNetworkReply *, const QList<QSslError> & ) ) );`
	`6535`	`+#endif`
`6534`	`6536`	`}`
`6535`	`6537`
`6536`	`6538`	`void QgisApp::namAuthenticationRequired( QNetworkReply reply, QAuthenticator auth )`
`@@ -6565,6 +6567,7 @@ void QgisApp::namProxyAuthenticationRequired( const QNetworkProxy &proxy, QAuthe`
`6565`	`6567`	`auth->setPassword( password );`
`6566`	`6568`	`}`
`6567`	`6569`
	`6570`	`+#ifdef QT_OPENSSL`
`6568`	`6571`	`void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors )`
`6569`	`6572`	`{`
`6570`	`6573`	`QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );`
`@@ -6589,6 +6592,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors`
`6589`	`6592`	`reply->ignoreSslErrors();`
`6590`	`6593`	`}`
`6591`	`6594`	`}`
	`6595`	`+#endif`
`6592`	`6596`
`6593`	`6597`	`void QgisApp::namUpdate()`
`6594`	`6598`	`{`