AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename TransferTimeoutPreset to DefaultTransferTimeoutConstant

Browse Source 
Found in API review. Replacing with the suggested name which is more Qt-ish.
And also preventively fix the name to contain its enum's name to follow the
conventions.

Change-Id: I00b510e36ccc831f107ecc3c79943d617726b4fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Timur Pocheptsov 2020-02-25 11:11:28 +01:00
parent 66e0079569
commit 0394961f95
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/access/qnetworkaccessmanager.h
View File

@ -171,7 +171,7 @@ public:
void setAutoDeleteReplies(bool autoDelete); void setAutoDeleteReplies(bool autoDelete);
int transferTimeout() const; int transferTimeout() const;
void setTransferTimeout(int timeout = QNetworkRequest::TransferTimeoutPreset); void setTransferTimeout(int timeout = QNetworkRequest::DefaultTransferTimeoutConstant);
Q_SIGNALS: Q_SIGNALS:
#ifndef QT_NO_NETWORKPROXY #ifndef QT_NO_NETWORKPROXY

6
src/network/access/qnetworkrequest.cpp
View File

@ -432,9 +432,9 @@ QT_BEGIN_NAMESPACE
A constant that can be used for enabling transfer A constant that can be used for enabling transfer
timeouts with a preset value. timeouts with a preset value.
\value TransferTimeoutPreset The transfer timeout in milliseconds. \value DefaultTransferTimeoutConstant The transfer timeout in milliseconds.
Used if setTimeout() is called Used if setTimeout() is called
without an argument. without an argument.
*/ */
class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate

4
src/network/access/qnetworkrequest.h
View File

@ -135,7 +135,7 @@ public:
}; };
enum TransferTimeoutConstant { enum TransferTimeoutConstant {
TransferTimeoutPreset = 30000 DefaultTransferTimeoutConstant = 30000
}; };
QNetworkRequest(); QNetworkRequest();
@ -190,7 +190,7 @@ public:
void setHttp2Configuration(const QHttp2Configuration &configuration); void setHttp2Configuration(const QHttp2Configuration &configuration);
int transferTimeout() const; int transferTimeout() const;
void setTransferTimeout(int timeout = TransferTimeoutPreset); void setTransferTimeout(int timeout = DefaultTransferTimeoutConstant);
#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC) #endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC)
private: private:
QSharedDataPointer<QNetworkRequestPrivate> d; QSharedDataPointer<QNetworkRequestPrivate> d;