Issue 768 - Switch from TR1 to C++11

src/FilterEngine.cpp

Index: src/FilterEngine.cpp
diff --git a/src/FilterEngine.cpp b/src/FilterEngine.cpp
index 23be280ec6427a65ea9cb64bea5ddff00a19039b..3e99b9cf09c2e29d40eb5756013d39a939038f3f 100644
--- a/src/FilterEngine.cpp
+++ b/src/FilterEngine.cpp
@@ -138,8 +138,8 @@ 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
@@ -285,8 +285,8 @@ void FilterEngine::SetShowNotificationCallback(const ShowNotificationCallback& v
     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()
@@ -382,8 +382,8 @@ 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()
@@ -404,8 +404,8 @@ void FilterEngine::ForceUpdateCheck(
   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;
@@ -424,8 +424,8 @@ void FilterEngine::UpdateCheckDone(const std::string& eventName,
 
 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()