diff options
Diffstat (limited to 'libraries/katabasis/src/Reply.cpp')
-rw-r--r-- | libraries/katabasis/src/Reply.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libraries/katabasis/src/Reply.cpp b/libraries/katabasis/src/Reply.cpp index 775b9202..3e27a7e6 100644 --- a/libraries/katabasis/src/Reply.cpp +++ b/libraries/katabasis/src/Reply.cpp @@ -7,25 +7,28 @@ namespace Katabasis { Reply::Reply(QNetworkReply *r, int timeOut, QObject *parent): QTimer(parent), reply(r) { setSingleShot(true); - connect(this, SIGNAL(error(QNetworkReply::NetworkError)), reply, SIGNAL(error(QNetworkReply::NetworkError)), Qt::QueuedConnection); - connect(this, SIGNAL(timeout()), this, SLOT(onTimeOut()), Qt::QueuedConnection); + connect(this, &Reply::timeout, this, &Reply::onTimeOut, Qt::QueuedConnection); start(timeOut); } void Reply::onTimeOut() { - emit error(QNetworkReply::TimeoutError); + timedOut = true; + reply->abort(); } +// ---------------------------- + ReplyList::~ReplyList() { foreach (Reply *timedReply, replies_) { delete timedReply; } } -void ReplyList::add(QNetworkReply *reply) { - if (reply && ignoreSslErrors()) - reply->ignoreSslErrors(); - add(new Reply(reply)); +void ReplyList::add(QNetworkReply *reply, int timeOut) { + if (reply && ignoreSslErrors()) { + reply->ignoreSslErrors(); + } + add(new Reply(reply, timeOut)); } void ReplyList::add(Reply *reply) { |