Skip to content
Permalink
Browse files
fix signal signature of QgsNetworkAccessManager::requestAboutToBeCreated
git-svn-id: http://svn.osgeo.org/qgis/trunk@13461 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 10, 2010
1 parent 499b773 commit 4b9ca010fdab817e5f0fe694b4478244ac7f77c7
Showing with 9 additions and 3 deletions.
  1. +1 −1 python/core/qgsnetworkaccessmanager.sip
  2. +4 −0 src/app/qgisapp.cpp
  3. +2 −0 src/app/qgisapp.h
  4. +2 −2 src/core/qgsnetworkaccessmanager.h
@@ -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 * );
@@ -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()
{
@@ -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:

@@ -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 );

0 comments on commit 4b9ca01

Please sign in to comment.