Implemented update checking functionality

include/AdblockPlus/FilterEngine.h

 /*
  * 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
  * 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 <vector>
+#include <functional>
 #include <map>
 #include <string>
+#include <vector>
 #include <AdblockPlus/JsEngine.h>
 #include <AdblockPlus/JsValue.h>
 
 #include "tr1_memory.h"
 
 namespace AdblockPlus
 {
   class FilterEngine;
 
   class Filter : public JsValue,
@@ skipping 26 matching lines @@
 
     Subscription(JsValuePtr value);
   };
 
   typedef std::tr1::shared_ptr<Filter> FilterPtr;
   typedef std::tr1::shared_ptr<Subscription> SubscriptionPtr;
 
   class FilterEngine
   {
   public:
-    typedef void(*UpdaterCallback)(const std::string& error);
+    typedef std::function<void(const std::string&)> UpdaterCallback;
 
     explicit FilterEngine(JsEnginePtr jsEngine);
     JsEnginePtr GetJsEngine() const { return jsEngine; }
     bool IsFirstRun() const;
     FilterPtr GetFilter(const std::string& text);
     SubscriptionPtr GetSubscription(const std::string& url);
     std::vector<FilterPtr> GetListedFilters() const;
     std::vector<SubscriptionPtr> GetListedSubscriptions() const;
     std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const;
     FilterPtr Matches(const std::string& url,
         const std::string& contentType,
         const std::string& documentUrl) const;
     std::vector<std::string> GetElementHidingSelectors(const std::string& domain) const;
     JsValuePtr GetPref(const std::string& pref) const;
     void SetPref(const std::string& pref, JsValuePtr value);
     void ForceUpdateCheck(UpdaterCallback callback = 0);

[Felix Dahlke, 2013/06/05 15:47:36]

I suppose you considered using an std::function here? Would like to hear why
not.

[Wladimir Palant, 2013/06/05 18:58:21]

No, I somehow forgot about that option. Works fine with std::bind() then :)

 
   private:
     JsEnginePtr jsEngine;
     bool initialized;
     bool firstRun;
     int updateCheckId;
 
     void InitDone(JsValueList& params);
-    void UpdateCheckDone(std::string eventName, UpdaterCallback callback, JsValueList& params);

[Felix Dahlke, 2013/06/05 15:47:36]

Any reason why eventName is not a const string reference?

[Wladimir Palant, 2013/06/05 18:58:21]

I had concerns where that reference would point to with a bound callback. Seems
to work however.

+    void UpdateCheckDone(const std::string& eventName, UpdaterCallback callback, JsValueList& params);
   };
 }
 
 #endif