diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-23 09:10:00 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-23 09:10:00 +0000 |
| commit | 2b7c50a79e27cc49a94df298176c67a0b602dc57 (patch) | |
| tree | 06be10abd19adf68493d1f1869b85ee7e76ed147 /src | |
| parent | 5d9e715ec7957c0bb87eb9a858420ff8a6301fbb (diff) | |
also wrtrim renamed, according to the standard, to rtrimw
git-svn-id: http://svn.miranda-ng.org/main/trunk@4516 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_core/mir_core.def | 2 | ||||
| -rw-r--r-- | src/mir_core/utils.cpp | 2 | ||||
| -rw-r--r-- | src/modules/database/profilemanager.cpp | 4 | ||||
| -rw-r--r-- | src/modules/findadd/findadd.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mir_core/mir_core.def b/src/mir_core/mir_core.def index c436496a31..44ad59c86a 100644 --- a/src/mir_core/mir_core.def +++ b/src/mir_core/mir_core.def @@ -103,7 +103,7 @@ mir_vsntprintf @100 mir_wstrdup @101
rtrim @102
wildcmp @103
-wrtrim @104
+rtrimw @104
mir_snprintf @105
mir_sntprintf @106
db_unset @107
diff --git a/src/mir_core/utils.cpp b/src/mir_core/utils.cpp index a98444d5da..21c9e8dfd5 100644 --- a/src/mir_core/utils.cpp +++ b/src/mir_core/utils.cpp @@ -56,7 +56,7 @@ MIR_CORE_DLL(char*) rtrim(char* str) return str;
}
-MIR_CORE_DLL(WCHAR*) wrtrim(WCHAR *str)
+MIR_CORE_DLL(WCHAR*) rtrimw(WCHAR *str)
{
if (str == NULL)
return NULL;
diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp index 67589a9d25..267fcde3f3 100644 --- a/src/modules/database/profilemanager.cpp +++ b/src/modules/database/profilemanager.cpp @@ -318,11 +318,11 @@ BOOL EnumProfilesForList(TCHAR *fullpath, TCHAR *profile, LPARAM lParam) }
item2.iSubItem = 3;
- item2.pszText = trtrim(_tctime(&statbuf.st_ctime));
+ item2.pszText = rtrimt(_tctime(&statbuf.st_ctime));
SendMessage(hwndList, LVM_SETITEMTEXT, iItem, (LPARAM)&item2);
item2.iSubItem = 4;
- item2.pszText = trtrim(_tctime(&statbuf.st_mtime));
+ item2.pszText = rtrimt(_tctime(&statbuf.st_mtime));
SendMessage(hwndList, LVM_SETITEMTEXT, iItem, (LPARAM)&item2);
}
return TRUE;
diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp index 9bbc8ddcff..1228083026 100644 --- a/src/modules/findadd/findadd.cpp +++ b/src/modules/findadd/findadd.cpp @@ -687,7 +687,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP else if (IsDlgButtonChecked(hwndDlg, IDC_BYPROTOID)) {
TCHAR str[256];
GetDlgItemText(hwndDlg, IDC_PROTOID, str, SIZEOF(str));
- trtrim(str);
+ rtrimt(str);
if (str[0] == 0)
MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);
else
@@ -696,7 +696,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP else if (IsDlgButtonChecked(hwndDlg, IDC_BYEMAIL)) {
TCHAR str[256];
GetDlgItemText(hwndDlg, IDC_EMAIL, str, SIZEOF(str));
- trtrim(str);
+ rtrimt(str);
if (str[0] == 0)
MessageBox(hwndDlg, sttErrMsg, sttErrTitle, MB_OK);
else
@@ -755,7 +755,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP else {
TCHAR str[256];
GetDlgItemText(hwndDlg, IDC_PROTOID, str, SIZEOF(str));
- if (*trtrim(str) == 0)
+ if (*rtrimt(str) == 0)
break;
PROTOSEARCHRESULT psr = {0};
|