From 6c213653d0841f00781e497a0cf724a145e75a0c Mon Sep 17 00:00:00 2001 From: Juha Vuolle Date: Mon, 12 Feb 2024 11:18:55 +0200 Subject: Inline old QNetworkRequest transferTimeout int overloads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt 6.7 introduced new std::chrono variants of the transfer timeout functions. We can now inline the old 'int milliseconds' functions to reduce the number of DLL entry points when one isn't needed. Task-number: QTBUG-122023 Change-Id: Iedcb6d0035bc6c3f03b87de543e9b02937b755e6 Reviewed-by: Mårten Nordheim --- src/network/access/qnetworkrequest.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/network/access/qnetworkrequest.cpp') diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index e084d08e8bf..6f5a7ff19ad 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -985,18 +985,16 @@ void QNetworkRequest::setDecompressedSafetyCheckThreshold(qint64 threshold) #if QT_CONFIG(http) || defined (Q_OS_WASM) /*! + \fn int QNetworkRequest::transferTimeout() const \since 5.15 Returns the timeout used for transfers, in milliseconds. \sa setTransferTimeout() */ -int QNetworkRequest::transferTimeout() const -{ - return int(d->transferTimeout.count()); -} /*! + \fn void QNetworkRequest::setTransferTimeout(int timeout) \since 5.15 Sets \a timeout as the transfer timeout in milliseconds. @@ -1004,10 +1002,6 @@ int QNetworkRequest::transferTimeout() const \sa setTransferTimeout(std::chrono::milliseconds), transferTimeout(), transferTimeoutAsDuration() */ -void QNetworkRequest::setTransferTimeout(int timeout) -{ - d->transferTimeout = std::chrono::milliseconds(timeout); -} /*! \since 6.7 -- cgit v1.2.3