summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel.cpp2
-rw-r--r--src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp2
-rw-r--r--src/xmlpatterns/schema/qxsdparticlechecker.cpp2
-rw-r--r--src/xmlpatterns/schema/qxsdschemachecker.cpp2
-rw-r--r--src/xmlpatterns/schema/qxsdschemaresolver.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index 053e16a..494a007 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -1107,7 +1107,7 @@ void QQuickXmlListModel::requestFinished()
}
d->redirectCount = 0;
- if (d->reply->error() != QNetworkReply::NoError) {
+ if (d->reply->networkError() != QNetworkReply::NoError) {
d->errorString = d->reply->errorString();
d->deleteReply();
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
index e25a9b6..b41f80f 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp
@@ -129,7 +129,7 @@ QNetworkReply *AccelTreeResourceLoader::load(const QUrl &uri,
ftpNetworkLoop.exec(QEventLoop::ExcludeUserInputEvents);
}
- if (reply->error() != QNetworkReply::NoError) {
+ if (reply->networkError() != QNetworkReply::NoError) {
const QString errorMessage(escape(reply->errorString()));
/* Note, we delete reply before we exit this function with error(). */
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker.cpp b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
index 139390d..ad7cc8e 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker.cpp
+++ b/src/xmlpatterns/schema/qxsdparticlechecker.cpp
@@ -464,7 +464,7 @@ bool XsdParticleChecker::subsumes(const XsdParticle::Ptr &particle, const XsdPar
}
QHash<XsdTerm::Ptr, XsdParticle::Ptr> particlesHash = XsdStateMachineBuilder::particleLookupMap(particle);
- particlesHash.unite(XsdStateMachineBuilder::particleLookupMap(derivedParticle));
+ particlesHash.insert(XsdStateMachineBuilder::particleLookupMap(derivedParticle));
/*
static int counter = 0;
diff --git a/src/xmlpatterns/schema/qxsdschemachecker.cpp b/src/xmlpatterns/schema/qxsdschemachecker.cpp
index 91a796a..9f7c6a2 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker.cpp
+++ b/src/xmlpatterns/schema/qxsdschemachecker.cpp
@@ -105,7 +105,7 @@ void XsdSchemaChecker::check()
void XsdSchemaChecker::addComponentLocationHash(const ComponentLocationHash &hash)
{
- m_componentLocationHash.unite(hash);
+ m_componentLocationHash.insert(hash);
}
/**
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver.cpp b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
index 1d21e31..7ca3808 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaresolver.cpp
@@ -264,7 +264,7 @@ void XsdSchemaResolver::addSubstitutionGroupType(const XsdElement::Ptr &element)
void XsdSchemaResolver::addComponentLocationHash(const ComponentLocationHash &hash)
{
- m_componentLocationHash.unite(hash);
+ m_componentLocationHash.insert(hash);
}
void XsdSchemaResolver::addEnumerationFacetValue(const AtomicValue::Ptr &facetValue, const NamespaceSupport &namespaceSupport)