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
@@ skipping 19 matching lines @@
 {
   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::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 106 matching lines @@
                       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::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;
+    typedef std::function<void(const std::string&)> UpdateAvailableCallback;
 
     /**
      * Callback type invoked when a manually triggered update check finishes.
      * The parameter is an optional error message.
      */
-    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;
+    typedef std::function<void(const std::string&)> 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::function<void(const std::string&, const JsValuePtr)> FilterChangeCallback;
 
@@ skipping 222 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