Issue 5165 - Remove SubscriptionPtr

include/AdblockPlus/FilterEngine.h

 /*
  * 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 72 matching lines @@
 
   /**
    * Wrapper for a subscription object.
    * There are no accessors for most
    * [subscription properties](https://adblockplus.org/jsdoc/adblockpluscore/Subscription.html),
    * use `GetProperty()` to retrieve them by name.
    */
   class Subscription : public JsValue,
                        public std::enable_shared_from_this<Subscription>
   {
+    friend class FilterEngine;
   public:
     /**
+     * Copy constructor
+     */
+    Subscription(const Subscription&);
+
+    /**
+     * Move constructor
+     */
+    Subscription(Subscription&&);
+
+    /**
+     * Assignment operator
+     */
+    Subscription& operator=(const Subscription&);

[sergei, 2017/04/24 18:19:36]

The same comments as in https://codereview.adblockplus.org/29419629/#msg8

[hub, 2017/04/24 19:16:51]

Done.

+
+    /**
      * Checks if this subscription has been added to the list of subscriptions.
      * @return `true` if this subscription has been added.
      */
     bool IsListed() const;
 
     /**
      * Adds this subscription to the list of subscriptions.
      */
     void AddToList();
 
@@ skipping 15 matching lines @@
     bool IsUpdating() const;
 
     /**
      * Indicates whether the subscription is the Acceptable Ads subscription.
      * @return `true` if this subscription is the Acceptable Ads subscription.
      */
     bool IsAA() const;
 
     bool operator==(const Subscription& subscription) const;
 
+  protected:
     /**
      * Creates a wrapper for an existing JavaScript subscription object.
      * Normally you shouldn't call this directly, but use
      * FilterEngine::GetSubscription() instead.
      * @param value JavaScript subscription object.
      */
     Subscription(JsValue&& value);
   };
 
   /**
    * Shared smart pointer to a `Filter` instance.
    */
   typedef std::unique_ptr<Filter> FilterPtr;
 
   /**
-   * Shared smart pointer to a `Subscription` instance.
-   */
-  typedef std::shared_ptr<Subscription> SubscriptionPtr;
-
-  /**
    * Main component of libadblockplus.
    * It handles:
    * - Filter management and matching.
    * - Subscription management and synchronization.
    * - Update checks for the application.
    */
   class FilterEngine
   {
   public:
     // Make sure to keep ContentType in sync with FilterEngine::contentTypes
@@ skipping 125 matching lines @@
      *        see https://adblockplus.org/en/filters.
      * @return New `Filter` instance.
      */
     Filter GetFilter(const std::string& text) const;
 
     /**
      * Retrieves a subscription object for the supplied URL.
      * @param url Subscription URL.
      * @return New `Subscription` instance.
      */
-    SubscriptionPtr GetSubscription(const std::string& url) const;
+    Subscription GetSubscription(const std::string& url) const;
 
     /**
      * Retrieves the list of custom filters.
      * @return List of custom filters.
      */
     std::vector<Filter> GetListedFilters() const;
 
     /**
      * Retrieves all subscriptions.
      * @return List of subscriptions.
      */
-    std::vector<SubscriptionPtr> GetListedSubscriptions() const;
+    std::vector<Subscription> GetListedSubscriptions() const;
 
     /**
      * Retrieves all recommended subscriptions.
      * @return List of recommended subscriptions.
      */
-    std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const;
+    std::vector<Subscription> FetchAvailableSubscriptions() const;
 
     /**
      * Ensures that the Acceptable Ads subscription is enabled or disabled.
      * @param enabled
      *   - if the value is `true`
      *     - ensure that the filter set includes an enabled AA subscription,
      *       adding it if needed and enabling it if disabled.
      *   - if the value is `false`
      *     - if an AA subscription is present, disable it.
      *     - if absent, do nothing.
@@ skipping 218 matching lines @@
       const JsValueList& param) const;
     FilterPtr GetWhitelistingFilter(const std::string& url,
       ContentTypeMask contentTypeMask, const std::string& documentUrl) const;
     FilterPtr GetWhitelistingFilter(const std::string& url,
       ContentTypeMask contentTypeMask,
       const std::vector<std::string>& documentUrls) const;
   };
 }
 
 #endif