Issue 768 - Switch from TR1 to C++11

include/AdblockPlus/FilterEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 #ifndef ADBLOCK_PLUS_FILTER_ENGINE_H
 #define ADBLOCK_PLUS_FILTER_ENGINE_H
 
 #include <functional>
 #include <map>
 #include <string>
 #include <vector>
 #include <AdblockPlus/JsEngine.h>
 #include <AdblockPlus/JsValue.h>
 #include <AdblockPlus/Notification.h>
 
-#include "tr1_memory.h"
-
 namespace AdblockPlus
 {
   class FilterEngine;
 
   /**
    * Wrapper for an Adblock Plus filter object.
    * There are no accessors for most
    * [filter properties](https://adblockplus.org/jsdoc/adblockplus/symbols/Filter.html),
    * use `GetProperty()` to retrieve them by name.
    */
   class Filter : public JsValue,
-                 public std::tr1::enable_shared_from_this<Filter>
+                 public std::enable_shared_from_this<Filter>

[Felix Dahlke, 2015/08/05 21:28:04]

Nit: This was wrapped because it didn't fit in 80 columns. Now it would, can be
in one line again.

[Wladimir Palant, 2015/08/06 12:24:54]

Sergei didn't address this nit and I think he is right - wrapping here isn't
because of the line length limit. See
https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Coding_Style...
- "When deriving from more than one class, put each on its own line."

[Felix Dahlke, 2015/08/06 18:19:01]

Oh, I wasn't aware of that, fair enough.

   {
   public:
     /**
      * Filter types, see https://adblockplus.org/en/filters.
      */
     enum Type {TYPE_BLOCKING, TYPE_EXCEPTION,
                TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION,
                TYPE_COMMENT, TYPE_INVALID};
 
     /**
@@ skipping 29 matching lines @@
     Filter(JsValuePtr value);
   };
 
   /**
    * Wrapper for a subscription object.
    * There are no accessors for most
    * [subscription properties](https://adblockplus.org/jsdoc/adblockplus/symbols/Subscription.html),
    * use `GetProperty()` to retrieve them by name.
    */
   class Subscription : public JsValue,
-                       public std::tr1::enable_shared_from_this<Subscription>
+                       public std::enable_shared_from_this<Subscription>
   {
   public:
     /**
      * Checks if this subscription has been added to the list of subscriptions.
      * @return `true` if this subscription has been added.
      */
     bool IsListed();
 
     /**
      * Adds this subscription to the list of subscriptions.
@@ skipping 24 matching lines @@
      * Normally you shouldn't call this directly, but use
      * FilterEngine::GetSubscription() instead.
      * @param value JavaScript subscription object.
      */
     Subscription(JsValuePtr value);
   };
 
   /**
    * Shared smart pointer to a `Filter` instance.
    */
-  typedef std::tr1::shared_ptr<Filter> FilterPtr;
+  typedef std::shared_ptr<Filter> FilterPtr;
 
   /**
    * Shared smart pointer to a `Subscription` instance.
    */
-  typedef std::tr1::shared_ptr<Subscription> SubscriptionPtr;
+  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
     /**
      * Possible resource content types.
      */
     enum ContentType {CONTENT_TYPE_OTHER, CONTENT_TYPE_SCRIPT,
                       CONTENT_TYPE_IMAGE, CONTENT_TYPE_STYLESHEET,
                       CONTENT_TYPE_OBJECT, CONTENT_TYPE_SUBDOCUMENT,
                       CONTENT_TYPE_DOCUMENT, CONTENT_TYPE_XMLHTTPREQUEST,
                       CONTENT_TYPE_OBJECT_SUBREQUEST, CONTENT_TYPE_FONT,
                       CONTENT_TYPE_MEDIA, CONTENT_TYPE_ELEMHIDE};
 
     /**
      * Callback type invoked when an update becomes available.
      * The parameter is the download URL of the update.
      */
-    typedef std::tr1::function<void(const std::string&)>
+    typedef std::function<void(const std::string&)>

[Felix Dahlke, 2015/08/05 21:28:04]

Nit: This was wrapped because it didn't fit in 80 columns. Now it would, can be
in one line again.

[sergei, 2015/08/06 07:35:26]

Fixed.

         UpdateAvailableCallback;
 
     /**
      * Callback type invoked when a manually triggered update check finishes.
      * The parameter is an optional error message.
      */
-    typedef std::tr1::function<void(const std::string&)>
+    typedef std::function<void(const std::string&)>

[Felix Dahlke, 2015/08/05 21:28:04]

Nit: This was wrapped because it didn't fit in 80 columns. Now it would, can be
in one line again.

[sergei, 2015/08/06 07:35:29]

Fixed.

         UpdateCheckDoneCallback;
 
     /**
      * Callback type invoked when the filters change.
      * The first parameter is the action event code (see
      * [FilterNotifier.triggerListeners](https://adblockplus.org/jsdoc/adblockplus/symbols/FilterNotifier.html#.triggerListeners)
      * for the full list).
      * The second parameter is the filter/subscription object affected, if any.
      */
-    typedef std::tr1::function<void(const std::string&, const JsValuePtr)> FilterChangeCallback;
+    typedef std::function<void(const std::string&, const JsValuePtr)> FilterChangeCallback;
 
     /**
      * Container of name-value pairs representing a set of preferences.
      */
     typedef std::map<std::string, AdblockPlus::JsValuePtr> Prefs;
 
     /**
      * Callback type invoked when a new notification should be shown.
      * The parameter is the Notification object to be shown.
      */
-    typedef std::tr1::function<void(const NotificationPtr&)> ShowNotificationCallback;
+    typedef std::function<void(const NotificationPtr&)> ShowNotificationCallback;
 
     /**
      * Constructor.
      * @param jsEngine `JsEngine` instance used to run JavaScript code
      *        internally.
      * @param preconfiguredPrefs `AdblockPlus::FilterEngine::Prefs`
      *        name-value list of preconfigured prefs.
      */
     explicit FilterEngine(JsEnginePtr jsEngine, 
         const Prefs& preconfiguredPrefs = Prefs()
@@ skipping 140 matching lines @@
      * `FilterEngine` will automatically check for updates in regular intervals,
      * so applications should only call this when the user triggers an update
      * check manually.
      * @param callback Optional callback to invoke when the update check is
      *        finished. The string parameter will be empty when the update check
      *        succeeded, or contain an error message if it failed.
      *        Note that the callback will be invoked whether updates are
      *        available or not - to react to updates being available, use
      *        `FilterEngine::SetUpdateAvailableCallback()`.
      */
-    void ForceUpdateCheck(UpdateCheckDoneCallback callback = 0);
+    void ForceUpdateCheck(UpdateCheckDoneCallback callback);
 
     /**
      * Sets the callback invoked when the filters change.
      * @param callback Callback to invoke.
      */
     void SetFilterChangeCallback(FilterChangeCallback callback);
 
     /**
      * Removes the callback invoked when the filters change.
      */
@@ skipping 41 matching lines @@
     void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params);
     void UpdateCheckDone(const std::string& eventName,
                          UpdateCheckDoneCallback callback, JsValueList& params);
     void FilterChanged(FilterChangeCallback callback, JsValueList& params);
     void ShowNotification(const ShowNotificationCallback& callback,
       const JsValueList& params);
   };
 }
 
 #endif