From 78725feda46a534fbe419b61b85f13741950997a Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 15 Apr 2016 09:00:33 +0200
Subject: [PATCH] Bring back QgsNetworkManager slots and signals removed in
 2eb8243 as deprecated

---
 python/core/qgsnetworkaccessmanager.sip | 20 ++++++++++++++++++++
 src/core/qgsnetworkaccessmanager.cpp    | 18 ++++++++++++++++++
 src/core/qgsnetworkaccessmanager.h      | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/python/core/qgsnetworkaccessmanager.sip b/python/core/qgsnetworkaccessmanager.sip
index b4e1e831978..9a15075b445 100644
--- a/python/core/qgsnetworkaccessmanager.sip
+++ b/python/core/qgsnetworkaccessmanager.sip
@@ -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 );
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
index 42f833a8993..2111cde8681 100644
--- a/src/core/qgsnetworkaccessmanager.cpp
+++ b/src/core/qgsnetworkaccessmanager.cpp
@@ -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();
+}
diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h
index 10bb7fbcce0..e388e4ab8f1 100644
--- a/src/core/qgsnetworkaccessmanager.h
+++ b/src/core/qgsnetworkaccessmanager.h
@@ -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();