FilterEngine API improvements

include/AdblockPlus/FilterEngine.h

 #ifndef ADBLOCKPLUS_FILTER_ENGINE_H
 #define ADBLOCKPLUS_FILTER_ENGINE_H
 
 #include <vector>
 #include <map>
 #include <string>
 #include <tr1/memory>

[Felix Dahlke, 2013/04/08 15:03:59]

As of GCC 4.6 (we can assume that on Android with a recent NDK), #include
<memory> should work as well. No Windows-specific changes necessary then.

[Wladimir Palant, 2013/04/09 05:56:34]

Not sure about the NDK but on Linux #include <memory> definitely doesn't work.

 
 namespace AdblockPlus
 {
   class JsEngine;
   class FilterEngine;
 
   class JsObject
   {
   public:
     std::string GetProperty(const std::string& name, const std::string& defaultValue) const;
@@ skipping 18 matching lines @@
 
     FilterEngine& filterEngine;
     std::map<std::string, std::string> stringProperties;
     std::map<std::string, int> intProperties;
     std::map<std::string, bool> boolProperties;
 #else
     JsObject();
 #endif
   };
 
-  enum FilterType {BLOCKING_RULE, EXCEPTION_RULE,

[Felix Dahlke, 2013/04/08 15:03:59]

I'd move this into the public section of Filter, so that we have Filter::Type.

Also, it's somewhat conventional to prefix enum values with their type name,
avoids polluting the namespace. So if we leave it here, FILTER_TYPE_BLOCKING, if
we move it into Filter, TYPE_BLOCKING (i.e. Filter::TYPE_BLOCKING).

-                   ELEMHIDE_RULE, ELEMHIDE_EXCEPTION_RULE,
-                   COMMENT_RULE, INVALID_RULE};
-
   class Filter : public JsObject,
                  public std::tr1::enable_shared_from_this<Filter>
   {
     friend class FilterEngine;
 
   public:
+    enum Type {TYPE_BLOCKING, TYPE_EXCEPTION,
+               TYPE_ELEMHIDE, TYPE_ELEMHIDE_EXCEPTION,
+               TYPE_COMMENT, TYPE_INVALID};
+
     bool IsListed() const;
     void AddToList();
     void RemoveFromList();
 
   private:
 #if FILTER_ENGINE_STUBS
     Filter(FilterEngine& filterEngine, const std::string& text);
 #else
     Filter();
 #endif
@@ skipping 43 matching lines @@
 #if FILTER_ENGINE_STUBS
     std::map<std::string, FilterPtr> knownFilters;
     std::vector<FilterPtr> listedFilters;
     std::map<std::string, SubscriptionPtr> knownSubscriptions;
     std::vector<SubscriptionPtr> listedSubscriptions;
 #endif
   };
 }
 
 #endif