diff options
Diffstat (limited to 'protocols/Weather/src')
| -rw-r--r-- | protocols/Weather/src/stdafx.h | 8 | ||||
| -rw-r--r-- | protocols/Weather/src/weather_conv.cpp | 4 | ||||
| -rw-r--r-- | protocols/Weather/src/weather_data.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/protocols/Weather/src/stdafx.h b/protocols/Weather/src/stdafx.h index 6a0ebd261d..5d358de96b 100644 --- a/protocols/Weather/src/stdafx.h +++ b/protocols/Weather/src/stdafx.h @@ -410,7 +410,7 @@ HICON GetStatusIconBig(MCONTACT hContact); WORD GetIcon(const wchar_t* cond, WIDATA *Data); void CaseConv(wchar_t *str); void TrimString(char *str); -void TrimString(WCHAR *str); +void TrimString(wchar_t *str); void ConvertBackslashes(char *str); char *GetSearchStr(char *dis); @@ -432,10 +432,10 @@ void EraseAllInfo(void); void GetDataValue(WIDATAITEM *UpdateData, wchar_t *Data, wchar_t** szInfo); void ConvertDataValue(WIDATAITEM *UpdateData, wchar_t *Data); void wSetData(char *&Data, const char *Value); -void wSetData(WCHAR *&Data, const char *Value); -void wSetData(WCHAR *&Data, const WCHAR *Value); +void wSetData(wchar_t *&Data, const char *Value); +void wSetData(wchar_t *&Data, const wchar_t *Value); void wfree(char *&Data); -void wfree(WCHAR *&Data); +void wfree(wchar_t *&Data); void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam); diff --git a/protocols/Weather/src/weather_conv.cpp b/protocols/Weather/src/weather_conv.cpp index e7f495e5f4..2c29e1865f 100644 --- a/protocols/Weather/src/weather_conv.cpp +++ b/protocols/Weather/src/weather_conv.cpp @@ -404,14 +404,14 @@ void TrimString(char *str) memmove(str, str + start, len - start + 1); } -void TrimString(WCHAR *str) +void TrimString(wchar_t *str) { size_t len, start; len = mir_wstrlen(str); while (len && (unsigned char)str[len - 1] <= ' ') str[--len] = 0; for (start = 0; (unsigned char)str[start] <= ' ' && str[start]; start++); - memmove(str, str + start, (len - start + 1) * sizeof(WCHAR)); + memmove(str, str + start, (len - start + 1) * sizeof(wchar_t)); } // convert \t to tab and \n to linefeed diff --git a/protocols/Weather/src/weather_data.cpp b/protocols/Weather/src/weather_data.cpp index 8cc44575b2..fe668dbfe8 100644 --- a/protocols/Weather/src/weather_data.cpp +++ b/protocols/Weather/src/weather_data.cpp @@ -356,7 +356,7 @@ void wSetData(char *&Data, const char *Value) Data = ""; } -void wSetData(WCHAR *&Data, const char *Value) +void wSetData(wchar_t *&Data, const char *Value) { if (Value[0] != 0) Data = (g_bIsUtf) ? mir_utf8decodeW(Value) : mir_a2u(Value); @@ -364,7 +364,7 @@ void wSetData(WCHAR *&Data, const char *Value) Data = L""; } -void wSetData(WCHAR *&Data, const WCHAR *Value) +void wSetData(wchar_t *&Data, const wchar_t *Value) { if (Value[0] != 0) Data = mir_wstrdup(Value); @@ -381,7 +381,7 @@ void wfree(char *&Data) Data = nullptr; } -void wfree(WCHAR *&Data) +void wfree(wchar_t *&Data) { if (Data && mir_wstrlen(Data) > 0) mir_free(Data); |