sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bring back QgsNetworkManager slots and signals removed in 2eb8243 as deprecated

Browse Source
This commit is contained in:
Juergen E. Fischer 2016-04-15 09:00:33 +02:00
parent 83036886b7
commit 78725feda4
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python/core/qgsnetworkaccessmanager.sip
View File

@ -60,12 +60,32 @@ class QgsNetworkAccessManager : QNetworkAccessManager
//! Setup the NAM according to the user's settings
void setupDefaultProxyAndCache();
//! return whether the system proxy should be used
bool useSystemProxy();
public slots:
/** Send GET request, calls get().
* Emits requestSent().
* @param request request to be sent
* @deprecated use get() directly
*/
void sendGet( const QNetworkRequest & request ) /Deprecated/;
/** Abort and delete reply.
* @param reply reply to be aborted.
* @deprecated use abort() and deleteLayer() on the reply directly
*/
void deleteReply( QNetworkReply * reply ) /Deprecated/;
signals:
void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * );
void requestCreated( QNetworkReply * );
void requestTimedOut( QNetworkReply * );
/** Emitted when request was sent by request()
* @param reply request reply
* @param sender the object which called request() slot.
* @deprecated only emitted from deprecated sendGet
*/
void requestSent( QNetworkReply * reply, QObject *sender );
protected:
virtual QNetworkReply *createRequest( QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0 );

18
src/core/qgsnetworkaccessmanager.cpp
View File

@ -384,3 +384,21 @@ void QgsNetworkAccessManager::setupDefaultProxyAndCache()
if ( cache() != newcache )
setCache( newcache );
}
void QgsNetworkAccessManager::sendGet( const QNetworkRequest & request )
{
QgsDebugMsg( "Entered" );
QNetworkReply * reply = get( request );
emit requestSent( reply, QObject::sender() );
}
void QgsNetworkAccessManager::deleteReply( QNetworkReply * reply )
{
QgsDebugMsg( "Entered" );
if ( !reply )
{
return;
}
reply->abort();
reply->deleteLater();
}

19
src/core/qgsnetworkaccessmanager.h
View File

@ -85,10 +85,29 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
//! return whether the system proxy should be used
bool useSystemProxy() { return mUseSystemProxy; }
public slots:
/** Send GET request, calls get().
* Emits requestSent().
* @param request request to be sent
* @deprecated use get() directly
*/
Q_DECL_DEPRECATED void sendGet( const QNetworkRequest & request );
/** Abort and delete reply.
* @param reply reply to be aborted.
* @deprecated use abort() and deleteLayer() on the reply directly
*/
Q_DECL_DEPRECATED void deleteReply( QNetworkReply * reply );
signals:
void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * );
void requestCreated( QNetworkReply * );
void requestTimedOut( QNetworkReply * );
/** Emitted when request was sent by request()
* @param reply request reply
* @param sender the object which called request() slot.
* @deprecated only emitted from deprecated sendGet
*/
void requestSent( QNetworkReply * reply, QObject *sender );
private slots:
void abortRequest();