[Build] Fixed building with Qt5

remotes/origin/falkon
nowrep 12 years ago
parent db664184d0
commit 463fa96e04
  1. 6
      src/lib/adblock/adblockrule.cpp
  2. 2
      src/plugins/GreaseMonkey/gm_jsobject.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;

@ -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"));

Loading…
Cancel
Save