| Index: src/plugin/PluginSettings.h |
| =================================================================== |
| --- a/src/plugin/PluginSettings.h |
| +++ b/src/plugin/PluginSettings.h |
| @@ -70,17 +70,20 @@ |
| static bool HasInstance(); |
| static CPluginSettings* GetInstance(); |
| - static CString GetDataPath(const CString& filename=L""); |
| + /** |
| + * A fully qualified path name in the application data directory, given only the file name. |
| + */ |
| + static std::wstring GetDataPath(const std::wstring & filename=L""); |
| bool IsPluginEnabled() const; |
| - std::map<CString, CString> GetFilterLanguageTitleList() const; |
| + std::map< std::wstring, std::wstring > GetFilterLanguageTitleList() const; |
| void SetWorkingThreadId(); |
| void SetWorkingThreadId(DWORD id); |
| bool IsWorkingThread(DWORD dwThread=0) const; |
| - static CString GetSystemLanguage(); |
| + static std::wstring GetSystemLanguage(); |
| DWORD m_WindowsBuildNumber; |
| public: |
| @@ -88,7 +91,7 @@ |
| void TogglePluginEnabled(); |
| bool GetPluginEnabled() const; |
| - void AddError(const CString& error, const CString& errorCode); |
| + void AddError(const std::wstring & error, const std::wstring & errorCode); |
| // Settings whitelist |
| #ifdef SUPPORT_WHITELIST |
| @@ -100,8 +103,8 @@ |
| bool ReadWhitelist(bool bDebug=true); |
| public: |
| - void AddWhiteListedDomain(const CString& domain); |
| - void RemoveWhiteListedDomain(const CString& domain); |
| + void AddWhiteListedDomain(const std::wstring & domain); |
| + void RemoveWhiteListedDomain(const std::wstring & domain); |
| int GetWhiteListedDomainCount() const; |
| std::vector<std::wstring> GetWhiteListedDomainList(); |
| #endif //SUPPORT_WHITELIST |
| @@ -111,9 +114,9 @@ |
| void SetSubscription(const std::wstring& url); |
| void SetDefaultSubscription(); |
| - CString GetSubscription(); |
| - CString GetAppLocale(); |
| - CString GetDocumentationLink(); |
| + std::wstring GetSubscription(); |
| + std::wstring GetAppLocale(); |
| + std::wstring GetDocumentationLink(); |
| }; |