Marshal all libadblockplus calls to the engine process

src/plugin/PluginSettings.h

Index: src/plugin/PluginSettings.h
===================================================================
--- a/src/plugin/PluginSettings.h
+++ b/src/plugin/PluginSettings.h
@@ -4,17 +4,17 @@
 * Exception errors are tested by calls to ExceptionsTest from: Main ...
 */
 
 #ifndef _PLUGIN_SETTINGS_H_
 #define _PLUGIN_SETTINGS_H_
 
 
 #include "PluginTypedef.h"
-#include "AdblockPlus.h"
+#include "AdblockPlusClient.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"
@@ -86,17 +86,17 @@ private:
   static CComAutoCriticalSection s_criticalSectionDomainHistory;
 #endif
 
   bool m_isPluginSelftestEnabled;
 
   void Clear();
 
   // Private constructor used by the singleton pattern
-  CPluginSettings();	
+  CPluginSettings();
 public:
 
   ~CPluginSettings();
 
   static CPluginSettings* s_instance;
 
   static bool s_isLightOnly;
   static bool HasInstance();
@@ -225,13 +225,13 @@ public:
   DWORD GetWindowsBuildNumber();
 
   void SetSubscription(BSTR language);
   void SetSubscription(std::string language);
   void SetDefaultSubscription();
   CString GetSubscription();
   void RefreshFilterlist();
 
-  std::vector<AdblockPlus::SubscriptionPtr> m_subscriptions;
+  std::vector<SubscriptionDescription> m_subscriptions;
 };
 
 
 #endif // _PLUGIN_SETTINGS_H_