AnyURI::Ptr AnyURI::fromValue(const QUrl &uri)
{
- return AnyURI::Ptr(new AnyURI(uri.toString()));
+ return AnyURI::Ptr(new AnyURI(QString::fromLatin1(uri.toEncoded())));
}
AnyURI::Ptr AnyURI::resolveURI(const QString &relative,
const QString &base)
{
const QUrl urlBase(base);
- return AnyURI::fromValue(urlBase.resolved(relative).toString());
+ const QUrl uri(urlBase.resolved(relative));
+ return AnyURI::fromValue(uri);
}
ItemType::Ptr AnyURI::type() const
* have to let it be an xs:string. Calling QVariant::toString()
* on a QVariant that contains a QUrl returns, surprisingly,
* an empty string. */
- return AtomicString::fromValue(value.toUrl().toString());
+ return AtomicString::fromValue(QString::fromLatin1(value.toUrl().toEncoded()));
}
case QVariant::ByteArray:
return HexBinary::fromValue(value.toByteArray());
, m_defaultFunctionNamespace(CommonNamespaces::XFN)
, m_orderingEmptySequence(Greatest)
, m_orderingMode(Ordered)
- , m_defaultCollation(QUrl::fromEncoded(CommonNamespaces::UNICODE_COLLATION))
+ , m_defaultCollation(QUrl(QLatin1String(CommonNamespaces::UNICODE_COLLATION)))
, m_baseURI(aBaseURI)
, m_messageHandler(handler)
, m_preserveMode(Preserve)
QVERIFY(buffer.open(QIODevice::WriteOnly));
QXmlSerializer serializer(query, &buffer);
-
- // these tests with data: URL fail since QUrl change e650dd3b6d8212d2c54ddb4a50558b508d0bf2b9
- QEXPECT_FAIL("data scheme with ASCII", "QTBUG-23953, fails", Abort);
- QEXPECT_FAIL("data scheme with ASCII no MIME type", "QTBUG-23953, fails", Abort);
QVERIFY(query.evaluateTo(&serializer));
QCOMPARE(result, expectedOutput);
const QString stringURI(parser.value(arg).toString());
if(parser.has(isURI))
- userURI = QUrl::fromEncoded(stringURI.toLatin1());
+ userURI = QUrl(stringURI);
else
userURI = QUrl::fromLocalFile(stringURI);
}
}
case QVariant::Url:
{
- const QUrl result(QUrl::fromEncoded(input.toLatin1()));
+ const QUrl result(input);
if(result.isValid())
return QVariant(result);