Issue 5165 - Remove SubscriptionPtr

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 59 matching lines @@
 {
   JsValue func = jsEngine->Evaluate("API.removeFilterFromList");
   func.Call(*this);
 }
 
 bool Filter::operator==(const Filter& filter) const
 {
   return GetProperty("text").AsString() == filter.GetProperty("text").AsString();
 }
 
+Subscription::Subscription(const Subscription& src)
+  : JsValue(src)
+{
+}
+
+Subscription::Subscription(Subscription&& src)
+  : JsValue(std::move(src))
+{
+}
+
 Subscription::Subscription(JsValue&& value)
     : JsValue(std::move(value))
 {
   if (!IsObject())
     throw std::runtime_error("JavaScript value is not an object");
 }
 
+Subscription& Subscription::operator=(const Subscription& src)
+{
+  static_cast<JsValue&>(*this) = src;
+  return *this;
+}
+
+Subscription& Subscription::operator=(Subscription&& src)
+{
+  static_cast<JsValue&>(*this) = std::move(src);
+  return *this;
+}
+
 bool Subscription::IsListed() const
 {
   JsValue func = jsEngine->Evaluate("API.isListedSubscription");
   return func.Call(*this).AsBool();
 }
 
 void Subscription::AddToList()
 {
   JsValue func = jsEngine->Evaluate("API.addSubscriptionToList");
   func.Call(*this);
@@ skipping 178 matching lines @@
 {
   return firstRun;
 }
 
 Filter FilterEngine::GetFilter(const std::string& text) const
 {
   JsValue func = jsEngine->Evaluate("API.getFilterFromText");
   return Filter(func.Call(jsEngine->NewValue(text)));
 }
 
-SubscriptionPtr FilterEngine::GetSubscription(const std::string& url) const
+Subscription FilterEngine::GetSubscription(const std::string& url) const
 {
   JsValue func = jsEngine->Evaluate("API.getSubscriptionFromUrl");
-  return SubscriptionPtr(new Subscription(func.Call(jsEngine->NewValue(url))));
+  return Subscription(func.Call(jsEngine->NewValue(url)));
 }
 
 std::vector<Filter> FilterEngine::GetListedFilters() const
 {
   JsValue func = jsEngine->Evaluate("API.getListedFilters");
   JsValueList values = func.Call().AsList();
   std::vector<Filter> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
     result.push_back(Filter(std::move(*it)));
   return result;
 }
 
-std::vector<SubscriptionPtr> FilterEngine::GetListedSubscriptions() const
+std::vector<Subscription> FilterEngine::GetListedSubscriptions() const
 {
   JsValue func = jsEngine->Evaluate("API.getListedSubscriptions");
   JsValueList values = func.Call().AsList();
-  std::vector<SubscriptionPtr> result;
+  std::vector<Subscription> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
-    result.push_back(SubscriptionPtr(new Subscription(std::move(*it))));
+    result.push_back(Subscription(std::move(*it)));
   return result;
 }
 
-std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const
+std::vector<Subscription> FilterEngine::FetchAvailableSubscriptions() const
 {
   JsValue func = jsEngine->Evaluate("API.getRecommendedSubscriptions");
   JsValueList values = func.Call().AsList();
-  std::vector<SubscriptionPtr> result;
+  std::vector<Subscription> result;
   for (JsValueList::iterator it = values.begin(); it != values.end(); it++)
-    result.push_back(SubscriptionPtr(new Subscription(std::move(*it))));
+    result.push_back(Subscription(std::move(*it)));
   return result;
 }
 
 void FilterEngine::SetAAEnabled(bool enabled)
 {
   jsEngine->Evaluate("API.setAASubscriptionEnabled").Call(jsEngine->NewValue(enabled));
 }
 
 bool FilterEngine::IsAAEnabled() const
 {
@@ skipping 245 matching lines @@
     FilterPtr filter = GetWhitelistingFilter(currentUrl, contentTypeMask, parentUrl);
     if (filter)
     {
       return filter;
     }
     currentUrl = parentUrl;
   }
   while (urlIterator != documentUrls.end());
   return FilterPtr();
 }