summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-02-25 11:11:28 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2020-02-25 19:53:27 +0100
commit0394961f953094ab3535b79329dace4ed9a0300d (patch)
treee31d417820581263fd39665c77263c92c8cc7bda
parent66e0079569393f29e542f8868ece2b9f3c362525 (diff)
Rename TransferTimeoutPreset to DefaultTransferTimeoutConstant
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>
-rw-r--r--src/network/access/qnetworkaccessmanager.h2
-rw-r--r--src/network/access/qnetworkrequest.cpp6
-rw-r--r--src/network/access/qnetworkrequest.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 375d2e03f7..a75b16a6ca 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -171,7 +171,7 @@ public:
void setAutoDeleteReplies(bool autoDelete);
int transferTimeout() const;
- void setTransferTimeout(int timeout = QNetworkRequest::TransferTimeoutPreset);
+ void setTransferTimeout(int timeout = QNetworkRequest::DefaultTransferTimeoutConstant);
Q_SIGNALS:
#ifndef QT_NO_NETWORKPROXY
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index 70b09dba22..f1c8575c58 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -432,9 +432,9 @@ QT_BEGIN_NAMESPACE
A constant that can be used for enabling transfer
timeouts with a preset value.
- \value TransferTimeoutPreset The transfer timeout in milliseconds.
- Used if setTimeout() is called
- without an argument.
+ \value DefaultTransferTimeoutConstant The transfer timeout in milliseconds.
+ Used if setTimeout() is called
+ without an argument.
*/
class QNetworkRequestPrivate: public QSharedData, public QNetworkHeadersPrivate
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index dcd2c6b61f..66b9a43e01 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -135,7 +135,7 @@ public:
};
enum TransferTimeoutConstant {
- TransferTimeoutPreset = 30000
+ DefaultTransferTimeoutConstant = 30000
};
QNetworkRequest();
@@ -190,7 +190,7 @@ public:
void setHttp2Configuration(const QHttp2Configuration &configuration);
int transferTimeout() const;
- void setTransferTimeout(int timeout = TransferTimeoutPreset);
+ void setTransferTimeout(int timeout = DefaultTransferTimeoutConstant);
#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC)
private:
QSharedDataPointer<QNetworkRequestPrivate> d;