diff options
Diffstat (limited to 'lib/urlfilter/adblock/adblocklist.cpp')
-rw-r--r-- | lib/urlfilter/adblock/adblocklist.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/lib/urlfilter/adblock/adblocklist.cpp b/lib/urlfilter/adblock/adblocklist.cpp index c749e9e..3be21bd 100644 --- a/lib/urlfilter/adblock/adblocklist.cpp +++ b/lib/urlfilter/adblock/adblocklist.cpp @@ -71,7 +71,7 @@ void AdBlockList::parseLine(const QString& line) if(parsedLine.isEmpty()) return; - if(parsedLine.startsWith(QLatin1Literal("!"))) { + if(parsedLine.startsWith(QLatin1String("!"))) { const auto comment = parseComment(parsedLine); if(comment) { @@ -84,7 +84,7 @@ void AdBlockList::parseLine(const QString& line) } // css rule -> filterleaves cannot do element blocking - if(parsedLine.contains(QLatin1Literal("##")) || parsedLine.contains(QLatin1Literal("#@#"))) { + if(parsedLine.contains(QLatin1String("##")) || parsedLine.contains(QLatin1String("#@#"))) { qDebug("TODO: %s", qUtf8Printable(parsedLine)); return; } @@ -93,7 +93,7 @@ void AdBlockList::parseLine(const QString& line) r.action = UrlFilter::Block; // exception rules - if(parsedLine.startsWith(QLatin1Literal("@@"))) { + if(parsedLine.startsWith(QLatin1String("@@"))) { r.action = UrlFilter::Allow; parsedLine.remove(0, 2); } @@ -102,24 +102,24 @@ void AdBlockList::parseLine(const QString& line) // parse options { - const int sepPos = parsedLine.indexOf(QLatin1Literal("$")); + const int sepPos = parsedLine.indexOf(QLatin1String("$")); if(sepPos != -1) { - const auto options = parsedLine.mid(sepPos + 1).split(QLatin1Literal(",")); + const auto options = parsedLine.mid(sepPos + 1).split(QLatin1String(",")); parsedLine = parsedLine.mid(0, sepPos); for(const QString &option : options) { - if(option.startsWith(QLatin1Literal("domain"))) { - const auto domainList = option.mid(7).split(QLatin1Literal("|")); + if(option.startsWith(QLatin1String("domain"))) { + const auto domainList = option.mid(7).split(QLatin1String("|")); for(const QString &domain : domainList) { - if(domain.startsWith(QLatin1Literal("~"))) { + if(domain.startsWith(QLatin1String("~"))) { r.disabledOn.append(domain.mid(1)); } else { r.enabledOn.append(domain); } } - } else if(option.endsWith(QLatin1Literal("match-case"))) { - matchCase = !option.startsWith(QLatin1Literal("~")); + } else if(option.endsWith(QLatin1String("match-case"))) { + matchCase = !option.startsWith(QLatin1String("~")); } else { const auto pair = parseResourceOption(option); @@ -130,26 +130,26 @@ void AdBlockList::parseLine(const QString& line) } } - if(parsedLine.startsWith(QLatin1Literal("/")) && parsedLine.endsWith(QLatin1Literal("/"))) { + if(parsedLine.startsWith(QLatin1String("/")) && parsedLine.endsWith(QLatin1String("/"))) { // regular expression rule parsedLine = parsedLine.mid(1, parsedLine.length() - 2); r.matcher = new ContentsMatcher<QRegularExpression>(parsedLine, UrlFilter::RegularExpressionMatch); - } else if(parsedLine.startsWith(QLatin1Literal("||")) && parsedLine.endsWith(QLatin1Literal("^"))) { + } else if(parsedLine.startsWith(QLatin1String("||")) && parsedLine.endsWith(QLatin1String("^"))) { parsedLine = parsedLine.mid(2, parsedLine.length() - 3); r.matcher = new ContentsMatcher<QString>(parsedLine, UrlFilter::DomainMatch); - } else if(parsedLine.startsWith(QLatin1Literal("|")) && parsedLine.endsWith(QLatin1Literal("|"))) { + } else if(parsedLine.startsWith(QLatin1String("|")) && parsedLine.endsWith(QLatin1String("|"))) { // string equals rule parsedLine = parsedLine.mid(1, parsedLine.length() - 2); r.matcher = new ContentsMatcher<QStringMatcher>(parsedLine, UrlFilter::StringEquals); - } else if(parsedLine.startsWith(QLatin1Literal("||"))) { + } else if(parsedLine.startsWith(QLatin1String("||"))) { // string starts with rule parsedLine = parsedLine.mid(2); r.matcher = new ContentsMatcher<QStringMatcher>(parsedLine, UrlFilter::StringStartsWith); - } else if(parsedLine.endsWith(QLatin1Literal("|"))) { + } else if(parsedLine.endsWith(QLatin1String("|"))) { // string ends with rule parsedLine.chop(1); r.matcher = new ContentsMatcher<QStringMatcher>(parsedLine, UrlFilter::StringEndsWith); @@ -158,20 +158,20 @@ void AdBlockList::parseLine(const QString& line) // generic contains rule // remove beginning and ending wildcards - if(parsedLine.startsWith(QLatin1Literal("*"))) + if(parsedLine.startsWith(QLatin1String("*"))) parsedLine = parsedLine.mid(1); - if(parsedLine.endsWith(QLatin1Literal("*"))) + if(parsedLine.endsWith(QLatin1String("*"))) parsedLine.chop(1); - if(parsedLine.contains(QLatin1Literal("*")) || parsedLine.contains(QLatin1Literal("^"))) { + if(parsedLine.contains(QLatin1String("*")) || parsedLine.contains(QLatin1String("^"))) { // check for wildcards and translate to regexp // wildcard "*" - any number of characters // separator "^" - end, ? or / - parsedLine.replace(QLatin1Literal("||"), QLatin1Literal("^\\w+://")); - parsedLine.replace(QLatin1Literal("|"), QLatin1Literal("\\|")); - parsedLine.replace(QLatin1Literal("*"), QLatin1Literal(".*")); - parsedLine.replace(QLatin1Literal("^"), QLatin1Literal("($|\\?|\\/)")); + parsedLine.replace(QLatin1String("||"), QLatin1String("^\\w+://")); + parsedLine.replace(QLatin1String("|"), QLatin1String("\\|")); + parsedLine.replace(QLatin1String("*"), QLatin1String(".*")); + parsedLine.replace(QLatin1String("^"), QLatin1String("($|\\?|\\/)")); r.matcher = new ContentsMatcher<QRegularExpression>(parsedLine, UrlFilter::RegularExpressionMatch); |