Some qt6 prep

This commit is contained in:
Nicolas Werner 2021-12-28 20:09:08 +01:00
parent 2866826356
commit 5ca98829f7
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
32 changed files with 89 additions and 66 deletions

View file

@ -32,15 +32,15 @@ MxcImageProvider::requestImageResponse(const QString &id, const QSize &requested
auto queryStart = id.lastIndexOf('?');
if (queryStart != -1) {
id_ = id.left(queryStart);
auto query = id.midRef(queryStart + 1);
auto query = QStringView(id).mid(queryStart + 1);
auto queryBits = query.split('&');
for (auto b : queryBits) {
if (b == "scale") {
if (b == QStringView(u"scale")) {
crop = false;
} else if (b.startsWith("radius=")) {
} else if (b.startsWith(QStringView(u"radius="))) {
radius = b.mid(7).toDouble();
} else if (b.startsWith("height=")) {
} else if (b.startsWith(u"height=")) {
size.setHeight(b.mid(7).toInt());
size.setWidth(0);
}
@ -109,7 +109,7 @@ MxcImageProvider::download(const QString &id,
// Protect against synapse not following the spec:
// https://github.com/matrix-org/synapse/issues/5302
&& requestedSize.height() <= 600 && requestedSize.width() <= 800) {
QString fileName = QString("%1_%2x%3_%4_radius%5")
QString fileName = QStringLiteral("%1_%2x%3_%4_radius%5")
.arg(QString::fromUtf8(id.toUtf8().toBase64(
QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)))
.arg(requestedSize.width())