Filter changed callback

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 262 matching lines @@
 void FilterEngine::UpdateCheckDone(const std::string& eventName, FilterEngine::UpdaterCallback 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(eventName, std::tr1::bind(&FilterEngine::FilterChanged,
-      this, "filterChange", callback, std::tr1::placeholders::_1));

[Wladimir Palant, 2013/07/19 09:37:57]

Still not point passing "filterChange" to the callback, this parameter isn't
even used ;)

Also, does this even compile with the eventName variable being undefined? It
should be "filterChange" instead.

+  jsEngine->SetEventCallback("filterChange", std::tr1::bind(&FilterEngine::FilterChanged,
+      this, callback, std::tr1::placeholders::_1));
 }
 
 void FilterEngine::RemoveFilterChangeCallback()
 {
-  jsEngine->RemoveEventCallback(eventName);

[Wladimir Palant, 2013/07/19 09:37:57]

Does this even compile with the eventName variable being undefined? It should be
"filterChange" instead.

-}
-
-void FilterEngine::FilterChanged(const std::string& eventName, FilterEngine::FilterChangeCallback callback, JsValueList& params)
+  jsEngine->RemoveEventCallback("filterChange");
+}
+
+void FilterEngine::FilterChanged(FilterEngine::FilterChangeCallback callback, JsValueList& params)
 {
   std::string action(params.size() >= 1 && !params[0]->IsNull() ? params[0]->AsString() : "");
-  std::string url(params.size() >= 2 && !params[1]->IsNull() ? params[1]->AsString() : "");

[Wladimir Palant, 2013/07/19 09:37:57]

Please keep the second parameter generic, something like:

JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));

The callback can then call new Filter(item) or new Subscription(item) if
necessary.

-  callback(action, url);
-}
+  JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
+  callback(action, item);
+}