Issue 768 - Switch from TR1 to C++11

src/FilterEngine.cpp

 /*
  * 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 120 matching lines @@
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
 
 FilterEngine::FilterEngine(JsEnginePtr jsEngine, 
                            const FilterEngine::Prefs& preconfiguredPrefs)
     : jsEngine(jsEngine), initialized(false), firstRun(false), updateCheckId(0)
 {
-  jsEngine->SetEventCallback("_init", std::tr1::bind(&FilterEngine::InitDone,
-      this, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback("_init", std::bind(&FilterEngine::InitDone,
+      this, std::placeholders::_1));
 
   {
     // Lock the JS engine while we are loading scripts, no timeouts should fire
     // until we are done.
     const JsContext context(jsEngine);
 
     // Set the preconfigured prefs
     JsValuePtr preconfiguredPrefsObject = jsEngine->NewObject();
     for (FilterEngine::Prefs::const_iterator it = preconfiguredPrefs.begin();
          it != preconfiguredPrefs.end(); it++)
@@ skipping 125 matching lines @@
   }
   func->Call(params);
 }
 
 void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& value)
 {
   if (!value)
     return;
 
   jsEngine->SetEventCallback("_showNotification",
-    std::tr1::bind(&FilterEngine::ShowNotification, this, value,
-                   std::tr1::placeholders::_1));
+    std::bind(&FilterEngine::ShowNotification, this, value,
+                   std::placeholders::_1));

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

Nit: This was previously indented on column (i.e. aligned with the argument in
the line above.

 }
 
 void FilterEngine::RemoveShowNotificationCallback()
 {
   jsEngine->RemoveEventCallback("_showNotification");
 }
 
 AdblockPlus::FilterPtr FilterEngine::Matches(const std::string& url,
     ContentType contentType,
     const std::string& documentUrl) const
@@ skipping 75 matching lines @@
   JsValuePtr func = jsEngine->Evaluate("API.getHostFromUrl");
   JsValueList params;
   params.push_back(jsEngine->NewValue(url));
   return func->Call(params)->AsString();
 }
 
 void FilterEngine::SetUpdateAvailableCallback(
     FilterEngine::UpdateAvailableCallback callback)
 {
   jsEngine->SetEventCallback("updateAvailable",
-      std::tr1::bind(&FilterEngine::UpdateAvailable, this, callback,
-                     std::tr1::placeholders::_1));
+      std::bind(&FilterEngine::UpdateAvailable, this, callback,
+                     std::placeholders::_1));

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

Nit: This was previously indented on column (i.e. aligned with the argument in
the line above.

 }
 
 void FilterEngine::RemoveUpdateAvailableCallback()
 {
   jsEngine->RemoveEventCallback("updateAvailable");
 }
 
 void FilterEngine::UpdateAvailable(
     FilterEngine::UpdateAvailableCallback callback, JsValueList& params)
 {
   if (params.size() >= 1 && !params[0]->IsNull())
     callback(params[0]->AsString());
 }
 
 void FilterEngine::ForceUpdateCheck(
     FilterEngine::UpdateCheckDoneCallback callback)
 {
   std::string eventName = "_updateCheckDone";
   eventName += ++updateCheckId;
 
-  jsEngine->SetEventCallback(eventName, std::tr1::bind(&FilterEngine::UpdateCheckDone,
-      this, eventName, callback, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback(eventName, std::bind(&FilterEngine::UpdateCheckDone,
+      this, eventName, callback, std::placeholders::_1));
 
   JsValuePtr func = jsEngine->Evaluate("API.forceUpdateCheck");
   JsValueList params;
   params.push_back(jsEngine->NewValue(eventName));
   func->Call(params);
 }
 
 void FilterEngine::UpdateCheckDone(const std::string& eventName,
     FilterEngine::UpdateCheckDoneCallback callback, JsValueList& params)
 {
   jsEngine->RemoveEventCallback(eventName);
 
   std::string error(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
   callback(error);
 }
 
 void FilterEngine::SetFilterChangeCallback(FilterEngine::FilterChangeCallback callback)
 {
-  jsEngine->SetEventCallback("filterChange", std::tr1::bind(&FilterEngine::FilterChanged,
-      this, callback, std::tr1::placeholders::_1));
+  jsEngine->SetEventCallback("filterChange", std::bind(&FilterEngine::FilterChanged,
+      this, callback, std::placeholders::_1));
 }
 
 void FilterEngine::RemoveFilterChangeCallback()
 {
   jsEngine->RemoveEventCallback("filterChange");
 }
 
 void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)
 {
   std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
@@ skipping 12 matching lines @@
 
 
 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
 {
   JsValueList params;
   params.push_back(jsEngine->NewValue(v1));
   params.push_back(jsEngine->NewValue(v2));
   JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
   return func->Call(params)->AsInt();
 }