summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-03-23 12:58:57 +0100
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2020-03-23 21:13:35 +0100
commit5ca8c0bc4e7e2f3af9a8d91d00ad11329a7cab8a (patch)
tree4353f59cebe63118254d0f7425c7b9f74bc781b4
parent50cc72f9d47e754547e6ac81b90cfa13b7470381 (diff)
downloadqtxmlpatterns-5ca8c0bc4e7e2f3af9a8d91d00ad11329a7cab8a.tar.gz
qtxmlpatterns: use the proper signal instead of the deprecated one
Task-number: QTBUG-82605 Change-Id: Iebd40c2683d9dbf21975c1e53506963bc40ac1cc Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp2
-rw-r--r--src/xmlpatterns/api/qiodevicedelegate.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
index e25a9b6..8abd99c 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
@@ -124,7 +124,7 @@ QNetworkReply *AccelTreeResourceLoader::load(const QUrl &uri,
request.setAttribute(QNetworkRequest::SynchronousRequestAttribute, true);
QNetworkReply *const reply = networkManager->get(request);
if (ftpSchemeUsed) {
- ftpNetworkLoop.connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(quit()));
+ ftpNetworkLoop.connect(reply, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), SLOT(quit()));
ftpNetworkLoop.connect(reply, SIGNAL(finished()), SLOT(quit()));
ftpNetworkLoop.exec(QEventLoop::ExcludeUserInputEvents);
}
diff --git a/src/xmlpatterns/api/qiodevicedelegate.cpp b/src/xmlpatterns/api/qiodevicedelegate.cpp
index d4049a5..3bba767 100644
--- a/src/xmlpatterns/api/qiodevicedelegate.cpp
+++ b/src/xmlpatterns/api/qiodevicedelegate.cpp
@@ -80,7 +80,7 @@ QIODeviceDelegate::QIODeviceDelegate(QIODevice *const source) : m_source(source)
void QIODeviceDelegate::networkTimeout()
{
setErrorString(QtXmlPatterns::tr("Network timeout."));
- error(QNetworkReply::TimeoutError);
+ errorOccurred(QNetworkReply::TimeoutError);
}
void QIODeviceDelegate::abort()