Issue 5603 - Support references in parameters of exported functions

compiled/subscription/UserDefinedSubscription.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
@@ skipping 34 matching lines @@
     sizeof(filterTypeToCategory) / sizeof(filterTypeToCategory[0]) == Filter::Type::VALUE_COUNT,
     "Unexpected number of filter types, was a new type added?"
   );
 }
 
 UserDefinedSubscription::UserDefinedSubscription(const String& id)
     : Subscription(Type::USERDEFINED, id), mDefaults(0)
 {
 }
 
-bool UserDefinedSubscription::IsDefaultFor(const Filter* filter) const
+bool UserDefinedSubscription::IsDefaultFor(const Filter& filter) const
 {
-  if (filter->mType >= Filter::Type::VALUE_COUNT)
+  if (filter.mType >= Filter::Type::VALUE_COUNT)
   {
     assert(false, "Filter type exceeds valid range");
     abort();
   }
-  return mDefaults & filterTypeToCategory[filter->mType];
+  return mDefaults & filterTypeToCategory[filter.mType];
 }
 
-void UserDefinedSubscription::MakeDefaultFor(const Filter* filter)
+void UserDefinedSubscription::MakeDefaultFor(const Filter& filter)
 {
-  if (filter->mType >= Filter::Type::VALUE_COUNT)
+  if (filter.mType >= Filter::Type::VALUE_COUNT)
   {
     assert(false, "Filter type exceeds valid range");
     abort();
   }
-  mDefaults |= filterTypeToCategory[filter->mType];
+  mDefaults |= filterTypeToCategory[filter.mType];
 }
 
-void UserDefinedSubscription::InsertFilterAt(Filter* filter, unsigned pos)
+void UserDefinedSubscription::InsertFilterAt(Filter& filter, unsigned pos)
 {
   if (pos >= mFilters.size())
     pos = mFilters.size();
-  mFilters.emplace(mFilters.begin() + pos, filter);
+  mFilters.emplace(mFilters.begin() + pos, &filter);
 
   if (GetListed())
   {
-    FilterNotifier::FilterChange(FilterNotifier::Topic::FILTER_ADDED, filter, this,
-        pos);
+    FilterNotifier::FilterChange(FilterNotifier::Topic::FILTER_ADDED, filter,
+        this, pos);
   }
 }
 
 bool UserDefinedSubscription::RemoveFilterAt(unsigned pos)
 {
   if (pos >= mFilters.size())
     return false;
 
   FilterPtr filter(mFilters[pos]);
   mFilters.erase(mFilters.begin() + pos);
   if (GetListed())
   {
     FilterNotifier::FilterChange(FilterNotifier::Topic::FILTER_REMOVED,
-        filter.get(), this, pos);
+        *filter.get(), this, pos);
   }
   return true;
 }
 
 OwnedString UserDefinedSubscription::Serialize() const
 {
   OwnedString result(Subscription::Serialize());
   if (!IsGeneric())
   {
     result.append(u"defaults="_str);
     if (mDefaults & FilterCategory::BLOCKING)
       result.append(u" blocking"_str);
     if (mDefaults & FilterCategory::WHITELIST)
       result.append(u" whitelist"_str);
     if (mDefaults & FilterCategory::ELEMHIDE)
       result.append(u" elemhide"_str);
     result.append(u'\n');
   }
   return result;
 }