Skip to content

Commit 535965b

Browse files
committedJan 23, 2019
Deprecate older thread-unsafe signals
1 parent ca592b7 commit 535965b

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed
 

‎python/core/auto_generated/qgsnetworkaccessmanager.sip.in

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,12 @@ Returns whether the system proxy should be used
161161
%End
162162

163163
signals:
164-
void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * );
164+
165+
void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * ) /Deprecated/;
166+
%Docstring
167+
168+
.. deprecated:: Use the thread-safe requestAboutToBeCreated( QgsNetworkRequestParameters ) signal instead.
169+
%End
165170

166171
void requestAboutToBeCreated( QgsNetworkRequestParameters request );
167172
%Docstring
@@ -211,7 +216,12 @@ created in any thread.
211216
.. versionadded:: 3.6
212217
%End
213218

214-
void requestCreated( QNetworkReply * );
219+
void requestCreated( QNetworkReply * ) /Deprecated/;
220+
%Docstring
221+
222+
.. deprecated:: Use the thread-safe requestAboutToBeCreated( QgsNetworkRequestParameters ) signal instead.
223+
%End
224+
215225
void requestTimedOut( QNetworkReply * );
216226

217227
protected:

‎src/core/qgsnetworkaccessmanager.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,15 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
208208
const int requestId = ++sRequestId;
209209

210210
emit requestAboutToBeCreated( QgsNetworkRequestParameters( op, req, requestId ) );
211+
Q_NOWARN_DEPRECATED_PUSH
211212
emit requestAboutToBeCreated( op, req, outgoingData );
213+
Q_NOWARN_DEPRECATED_POP
212214
QNetworkReply *reply = QNetworkAccessManager::createRequest( op, req, outgoingData );
213215
reply->setProperty( "requestId", requestId );
214216

217+
Q_NOWARN_DEPRECATED_PUSH
215218
emit requestCreated( reply );
219+
Q_NOWARN_DEPRECATED_POP
216220

217221
// The timer will call abortRequest slot to abort the connection if needed.
218222
// The timer is stopped by the finished signal and is restarted on downloadProgress and

‎src/core/qgsnetworkaccessmanager.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <QNetworkRequest>
2828

2929
#include "qgis_core.h"
30+
#include "qgis_sip.h"
3031

3132
/**
3233
* \class QgsNetworkRequestParameters
@@ -164,7 +165,11 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
164165
bool useSystemProxy() const { return mUseSystemProxy; }
165166

166167
signals:
167-
void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * );
168+
169+
/**
170+
* \deprecated Use the thread-safe requestAboutToBeCreated( QgsNetworkRequestParameters ) signal instead.
171+
*/
172+
Q_DECL_DEPRECATED void requestAboutToBeCreated( QNetworkAccessManager::Operation, const QNetworkRequest &, QIODevice * ) SIP_DEPRECATED;
168173

169174
/**
170175
* Emitted when a network request is about to be created.
@@ -208,7 +213,11 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
208213
*/
209214
void requestTimedOut( QgsNetworkRequestParameters request );
210215

211-
void requestCreated( QNetworkReply * );
216+
/**
217+
* \deprecated Use the thread-safe requestAboutToBeCreated( QgsNetworkRequestParameters ) signal instead.
218+
*/
219+
Q_DECL_DEPRECATED void requestCreated( QNetworkReply * ) SIP_DEPRECATED;
220+
212221
void requestTimedOut( QNetworkReply * );
213222

214223
private slots:

0 commit comments

Comments
 (0)
Please sign in to comment.