Issue 5146 - Implement DownloadableSubscription parsing in C++

compiled/storage/FilterStorage.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 <vector>
 
 #include "FilterStorage.h"
 #include "../filter/Filter.h"
 #include "../subscription/UserDefinedSubscription.h"
 #include "../FilterNotifier.h"
+
+ABP_NS_USING
 
 FilterStorage* FilterStorage::mInstance = new FilterStorage();
 
 FilterStorage::Subscriptions::size_type FilterStorage::GetSubscriptionCount() const
 {
   return mSubscriptions.size();
 }
 
 Subscription* FilterStorage::SubscriptionAt(FilterStorage::Subscriptions::size_type index) const
 {
@@ skipping 81 matching lines @@
   FilterNotifier::SubscriptionChange(
     FilterNotifier::Topic::SUBSCRIPTION_FILTERS_REPLACED,
     subscription
     );
 }
 
 bool FilterStorage::MoveSubscription(Subscription& subscription,
                                      const Subscription* insertBefore)
 {
   int oldPos = IndexOfSubscription(subscription);
-  assert2(oldPos >= 0, u"Attempt to move a subscription that is not in the list"_str);
+  assert2(oldPos >= 0, ABP_TEXT("Attempt to move a subscription that is not in the list"_str));
   if (oldPos == -1)
     return false;
 
   int newPos = -1;
   if (insertBefore)
     newPos = IndexOfSubscription(*insertBefore);
   if (newPos == -1)
     newPos = mSubscriptions.size();
 
   if (newPos > oldPos)
     newPos--;
 
   if (newPos == oldPos)
     return false;
 
   mSubscriptions.erase(mSubscriptions.begin() + oldPos);
   mSubscriptions.emplace(mSubscriptions.begin() + newPos, &subscription);
 
   FilterNotifier::SubscriptionChange(
     FilterNotifier::Topic::SUBSCRIPTION_MOVED,
     subscription
   );
   return true;
 }