Index: src/plugin/PluginClientBase.h |
=================================================================== |
--- a/src/plugin/PluginClientBase.h |
+++ b/src/plugin/PluginClientBase.h |
@@ -16,13 +16,13 @@ |
int m_errorId; |
int m_errorSubid; |
DWORD m_errorCode; |
- CString m_errorDescription; |
+ std::wstring m_errorDescription; |
DWORD m_processId; |
DWORD m_threadId; |
public: |
- CPluginError(int errorId, int errorSubid, DWORD errorCode, const CString& errorDesc) : |
+ CPluginError(int errorId, int errorSubid, DWORD errorCode, const std::wstring & errorDesc) : |
m_errorId(errorId), m_errorSubid(errorSubid), m_errorCode(errorCode), m_errorDescription(errorDesc) |
{ |
m_processId = ::GetCurrentProcessId(); |
@@ -38,7 +38,7 @@ |
int GetErrorId() const { return m_errorId; } |
int GetErrorSubid() const { return m_errorSubid; } |
DWORD GetErrorCode() const { return m_errorCode; } |
- CString GetErrorDescription() const { return m_errorDescription; } |
+ std::wstring GetErrorDescription() const { return m_errorDescription; } |
DWORD GetProcessId() const { return m_processId; } |
DWORD GetThreadId() const { return m_threadId; } |
}; |
@@ -67,12 +67,11 @@ |
static void SetLocalization(); |
- static bool IsValidDomain(const CString& domain); |
- static CString& UnescapeUrl(CString& url); |
+ static bool IsValidDomain(const std::wstring & domain); |
- static void LogPluginError(DWORD errorCode, int errorId, int errorSubid, const CString& description="", bool isAsync=false, DWORD dwProcessId=0, DWORD dwThreadId=0); |
+ static void LogPluginError(DWORD errorCode, int errorId, int errorSubid, const std::wstring & description=L"", bool isAsync=false, DWORD dwProcessId=0, DWORD dwThreadId=0); |
- static void PostPluginError(int errorId, int errorSubid, DWORD errorCode, const CString& errorDescription); |
+ static void PostPluginError(int errorId, int errorSubid, DWORD errorCode, const std::wstring & errorDescription); |
static bool PopFirstPluginError(CPluginError& pluginError); |
}; |