| Index: Shared/PluginSettings.h |
| =================================================================== |
| --- a/Shared/PluginSettings.h |
| +++ b/Shared/PluginSettings.h |
| @@ -70,11 +70,6 @@ |
| CString m_tabNumber; |
| -#ifdef SUPPORT_WHITELIST |
| - TDomainList m_domainList; |
| - TDomainHistory m_domainHistory; |
| -#endif |
| - |
| CPluginSettings::TProperties m_properties; |
| bool m_isDirty; |
| @@ -144,13 +139,6 @@ |
| 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; |
| @@ -227,24 +215,18 @@ |
| 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); |
| + 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(); |