Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string

compiled/filter/ActiveFilter.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cstdio>
 
 #include "ActiveFilter.h"
 #include "../StringScanner.h"
 
 ABP_NS_USING
 
-const DependentString ActiveFilter::DEFAULT_DOMAIN(u""_str);
+const DependentString ActiveFilter::DEFAULT_DOMAIN(ABP_TEXT(""_str));
 
 ActiveFilter::ActiveFilter(Type type, const String& text, bool ignoreTrailingDot)
     : Filter(type, text), mIgnoreTrailingDot(ignoreTrailingDot),
       mDisabled(false), mHitCount(0), mLastHit(0)
 {
 }
 
 ActiveFilter::DomainMap* ActiveFilter::GetDomains() const
 {
   return mDomains.get();
@@ skipping 17 matching lines @@
 
   StringScanner scanner(domains, 0, separator);
   String::size_type start = 0;
   bool reverse = false;
   bool hasIncludes = false;
   bool done = scanner.done();
   while (!done)
   {
     done = scanner.done();
     String::value_type currChar = scanner.next();
-    if (currChar == u'~' && scanner.position() == start)
+    if (currChar == ABP_TEXT('~') && scanner.position() == start)
     {
       start++;
       reverse = true;
     }
     else if (currChar == separator)
     {
       String::size_type len = scanner.position() - start;
-      if (len > 0 && mIgnoreTrailingDot && domains[start + len - 1] == '.')
+      if (len > 0 && mIgnoreTrailingDot && domains[start + len - 1] == ABP_TEXT('.'))
         len--;
       if (len > 0)
       {
         enter_context("Adding to ActiveFilter.mDomains");
         (*mDomains)[DependentString(domains, start, len)] = !reverse;
         exit_context();
 
         if (!reverse)
           hasIncludes = true;
       }
@@ skipping 31 matching lines @@
     return true;
 
   // If the document has no host name, match only if the filter isn't restricted
   // to specific domains
   if (docDomain.empty())
     return (*domains)[DEFAULT_DOMAIN];
 
   docDomain.toLower();
 
   String::size_type len = docDomain.length();
-  if (len > 0 && mIgnoreTrailingDot && docDomain[len - 1] == '.')
+  if (len > 0 && mIgnoreTrailingDot && docDomain[len - 1] == ABP_TEXT('.'))
     docDomain.reset(docDomain, 0, len - 1);
   while (true)
   {
     auto it = domains->find(docDomain);
     if (it)
       return it->second;
 
-    String::size_type nextDot = docDomain.find(u'.');
+    String::size_type nextDot = docDomain.find(ABP_TEXT('.'));
     if (nextDot == docDomain.npos)
       break;
     docDomain.reset(docDomain, nextDot + 1);
   }
   return (*domains)[DEFAULT_DOMAIN];
 }
 
 bool ActiveFilter::IsActiveOnlyOnDomain(DependentString& docDomain) const
 {
   auto domains = GetDomains();
   if (!domains || docDomain.empty() || (*domains)[DEFAULT_DOMAIN])
     return false;
 
   docDomain.toLower();
 
   String::size_type len = docDomain.length();
-  if (len > 0 && mIgnoreTrailingDot && docDomain[len - 1] == '.')
+  if (len > 0 && mIgnoreTrailingDot && docDomain[len - 1] == ABP_TEXT('.'))
     docDomain.reset(docDomain, 0, len - 1);
   for (const auto& item : *domains)
   {
     if (!item.second || item.first.equals(docDomain))
       continue;
 
     size_t len1 = item.first.length();
     size_t len2 = docDomain.length();
     if (len1 > len2 &&
         DependentString(item.first, len1 - len2).equals(docDomain) &&
-        item.first[len1 - len2 - 1] == u'.')
+        item.first[len1 - len2 - 1] == ABP_TEXT('.'))
     {
       continue;
     }
 
     return false;
   }
   return true;
 }
 
 bool ActiveFilter::IsGeneric() const
 {
   auto sitekeys = GetSitekeys();
   auto domains = GetDomains();
   return !sitekeys && (!domains || (*domains)[DEFAULT_DOMAIN]);
 }
 
 OwnedString ActiveFilter::Serialize() const
 {
   /* TODO this is very inefficient */
   OwnedString result(Filter::Serialize());
   if (mDisabled)
-    result.append(u"disabled=true\n"_str);
+    result.append(ABP_TEXT("disabled=true\n"_str));
   if (mHitCount)
   {
-    result.append(u"hitCount="_str);
+    result.append(ABP_TEXT("hitCount="_str));
     result.append(mHitCount);
-    result.append(u'\n');
+    result.append(ABP_TEXT('\n'));
   }
   if (mLastHit)
   {
-    result.append(u"lastHit="_str);
+    result.append(ABP_TEXT("lastHit="_str));
     result.append(mLastHit);
-    result.append(u'\n');
+    result.append(ABP_TEXT('\n'));
   }
   return result;
 }