Initial libadblockplus integration

Shared/PluginSettings.h

 /**
 * This class contains all client functionality of the IE plugin
 *
 * Exception errors are tested by calls to ExceptionsTest from: Main ...
 */
 
 #ifndef _PLUGIN_SETTINGS_H_
 #define _PLUGIN_SETTINGS_H_
 
 
 #include "PluginTypedef.h"
-
+#include "AdblockPlus.h"
 
 // Main settings
 
 #define SETTING_PLUGIN_INFO_PANEL           L"plugininfopanel"
 #define SETTING_PLUGIN_VERSION          L"pluginversion"
 #define SETTING_PLUGIN_UPDATE_URL       L"pluginupdateurl"
 #define SETTING_PLUGIN_UPDATE_VERSION   L"pluginupdateversion"
 #define SETTING_PLUGIN_UPDATE_TIME      L"pluginupdatetime"
 #define SETTING_PLUGIN_SELFTEST         L"pluginselftest"
 #define SETTING_LANGUAGE                L"language"
@@ skipping 40 matching lines @@
   bool m_isFirstRun;
   bool m_isFirstRunUpdate;
 
   DWORD m_dwMainProcessId;
   DWORD m_dwMainThreadId;
   DWORD m_dwMainUiThreadId;
   DWORD m_dwWorkingThreadId;
 
   CString m_tabNumber;
 
-#ifdef SUPPORT_WHITELIST
-  TDomainList m_domainList;
-  TDomainHistory m_domainHistory;
-#endif
-
   CPluginSettings::TProperties m_properties;
 
   bool m_isDirty;
 
   CString m_settingsVersion;
   std::auto_ptr<CPluginIniFileW> m_settingsFile;
 
   static WCHAR* s_dataPath;
   static WCHAR* s_dataPathParent;
 
@@ skipping 49 matching lines @@
   bool IsPluginUpdateAvailable() const;
 
   bool IsPluginSelftestEnabled();
 
   bool FilterlistExpired(CString filterlist) const;
   bool FilterShouldLoad(CString filterlist) const;
   bool SetFilterRefreshDate(CString filterlist, time_t refreshtime);
 
   std::map<CString, CString> GetFilterLanguageTitleList() const;
 
-#ifdef SUPPORT_WHITELIST
-
-  void AddDomainToHistory(const CString& domain);
-  TDomainHistory GetDomainHistory() const;
-
-#endif // SUPPORT_WHITELIST
-
   void SetMainProcessId();
   void SetMainProcessId(DWORD id);
   bool IsMainProcess(DWORD dwProcessId=0) const;
 
   void SetMainUiThreadId();
   void SetMainUiThreadId(DWORD id);
   bool IsMainUiThread(DWORD dwThread=0) const;
 
   void SetMainThreadId();
   void SetMainThreadId(DWORD id);
@@ skipping 56 matching lines @@
   void IncrementTabVersion(const CString& key);
 
   // Settings whitelist
 #ifdef SUPPORT_WHITELIST
 
 private:
 
   bool m_isDirtyWhitelist;
   DWORD m_WindowsBuildNumber;
 
-  TDomainList m_whitelist;
-  TDomainList m_whitelistToGo;
-
   std::auto_ptr<CPluginIniFileW> m_settingsFileWhitelist;
+  std::vector<std::string> m_whitelistedDomains;
 
   void ClearWhitelist();
-
   bool ReadWhitelist(bool bDebug=true);
-  bool WriteWhitelist(bool bDebug=true);
-
-public:
-
-  void AddWhiteListedDomain(const CString& domain, int reason=1, bool isToGo=false);
-  void RemoveWhiteListedDomainsToGo(const TDomainList& domains);
-  void ReplaceWhiteListedDomains(const TDomainList& domains);
+
+public:
+
+  void AddWhiteListedDomain(const CString& domain);
   bool IsWhiteListedDomain(const CString& domain) const;
   int GetWhiteListedDomainCount() const;
-  TDomainList GetWhiteListedDomainList(bool isToGo=false) const;
+  std::vector<std::string> GetWhiteListedDomainList(bool isToGo=false);
 
   bool MakeRequestForUpdate();
   bool RefreshWhitelist();
   DWORD GetWindowsBuildNumber();
 
   void SetSubscription(BSTR language);
   void SetSubscription(std::string language);
+  CString GetSubscription();
   void RefreshFilterlist();
-
-
 #endif //SUPPORT_WHITELIST
 
+  std::vector<AdblockPlus::SubscriptionPtr> m_subscriptions;
 };
 
 
 #endif // _PLUGIN_SETTINGS_H_