From 463fa96e0401cc0fb0f4cc16d597fe89c563dfd3 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 6 Apr 2014 13:50:09 +0200 Subject: [PATCH] [Build] Fixed building with Qt5 --- src/lib/adblock/adblockrule.cpp | 6 +++--- src/plugins/GreaseMonkey/gm_jsobject.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/adblock/adblockrule.cpp b/src/lib/adblock/adblockrule.cpp index fd2e344b2..d777ca4f3 100644 --- a/src/lib/adblock/adblockrule.cpp +++ b/src/lib/adblock/adblockrule.cpp @@ -545,7 +545,7 @@ bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const return false; for (int i = 0; i < filter.size(); ++i) { - switch (filter.at(i).toAscii()) { + switch (filter.at(i).toLatin1()) { case '/': case ':': case '?': @@ -564,7 +564,7 @@ bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const bool AdBlockRule::filterIsOnlyEndsMatch(const QString &filter) const { for (int i = 0; i < filter.size(); ++i) { - switch (filter.at(i).toAscii()) { + switch (filter.at(i).toLatin1()) { case '^': case '*': return false; @@ -592,7 +592,7 @@ QString AdBlockRule::createRegExpFromFilter(const QString &filter) const for (int i = 0; i < filter.size(); ++i) { const QChar c = filter.at(i); - switch (c.toAscii()) { + switch (c.toLatin1()) { case '^': parsed.append(QL1S("(?:[^\\w\\d\\-.%]|$)")); break; diff --git a/src/plugins/GreaseMonkey/gm_jsobject.cpp b/src/plugins/GreaseMonkey/gm_jsobject.cpp index 76108c2bf..22d28d895 100644 --- a/src/plugins/GreaseMonkey/gm_jsobject.cpp +++ b/src/plugins/GreaseMonkey/gm_jsobject.cpp @@ -47,7 +47,7 @@ QVariant GM_JSObject::getValue(const QString &nspace, const QString &name, const return dValue; } - switch (savedValue.at(0).unicode()) { + switch (savedValue.at(0).toLatin1()) { case 'b': return QVariant(actualValue == QLatin1String("true"));