remove duplicate qt_timeout_value

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-19 04:24:31 +00:00
parent a0ef87cd2b
commit 28ef6a8b79
5 changed files with 4 additions and 13 deletions

View file

@ -23,19 +23,6 @@ static void downloadBufferDeleter(char *ptr)
delete[] ptr;
}
/*
Returns the difference between msecs and elapsed. If msecs is -1,
however, -1 is returned.
*/
static int qt_timeout_value(int msecs, int elapsed)
{
if (msecs == -1)
return -1;
int timeout = msecs - elapsed;
return timeout < 0 ? 0 : timeout;
}
QT_END_NAMESPACE
#endif // QNETWORKCOMMON_H

View file

@ -380,6 +380,7 @@
#include <qscopedvaluerollback.h>
#include <qsslsocket.h>
#include <qthread_p.h>
#include <qcore_unix_p.h>
#include "qnetworkcommon_p.h"
#ifdef QABSTRACTSOCKET_DEBUG

View file

@ -46,6 +46,7 @@
#include "qhttp.h"
#include "qelapsedtimer.h"
#include "qnetworkinterface.h"
#include "qcore_unix_p.h"
#include "qnetworkcommon_p.h"
#if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP)

View file

@ -57,6 +57,7 @@
#include "qauthenticator.h"
#include "qendian.h"
#include "qnetworkinterface.h"
#include "qcore_unix_p.h"
#include "qnetworkcommon_p.h"
QT_BEGIN_NAMESPACE

View file

@ -296,6 +296,7 @@
#include "qsslsocket.h"
#include "qsslsocket_openssl_p.h"
#include "qsslconfiguration_p.h"
#include "qcore_unix_p.h"
#include "qnetworkcommon_p.h"
#include <QtCore/qdebug.h>