From b280d2eae93fb22b4fdb45218d8a06287a97030e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:49:22 +0000 Subject: replace _tcscmp to mir_tstrcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/fonts/FontOptions.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/modules/fonts/FontOptions.cpp') diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp index 1029abade3..6efdc67f7d 100644 --- a/src/modules/fonts/FontOptions.cpp +++ b/src/modules/fonts/FontOptions.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static int sttCompareFont(const FontInternal* p1, const FontInternal* p2) { - int result = _tcscmp(p1->group, p2->group); + int result = mir_tstrcmp(p1->group, p2->group); if (result != 0) return result; @@ -38,14 +38,14 @@ static int sttCompareFont(const FontInternal* p1, const FontInternal* p2) if (result != 0) return result; - return _tcscmp(p1->getName(), p2->getName()); + return mir_tstrcmp(p1->getName(), p2->getName()); } OBJLIST font_id_list(20, sttCompareFont), font_id_list_w2(20, sttCompareFont), font_id_list_w3(20, sttCompareFont); static int sttCompareColour(const ColourInternal* p1, const ColourInternal* p2) { - int result = _tcscmp(p1->group, p2->group); + int result = mir_tstrcmp(p1->group, p2->group); if (result != 0) return result; @@ -53,14 +53,14 @@ static int sttCompareColour(const ColourInternal* p1, const ColourInternal* p2) if (result != 0) return result; - return _tcscmp(p1->getName(), p2->getName()); + return mir_tstrcmp(p1->getName(), p2->getName()); } OBJLIST colour_id_list(10, sttCompareColour), colour_id_list_w2(10, sttCompareColour), colour_id_list_w3(10, sttCompareColour); static int sttCompareEffect(const EffectInternal* p1, const EffectInternal* p2) { - int result = _tcscmp(p1->group, p2->group); + int result = mir_tstrcmp(p1->group, p2->group); if (result != 0) return result; @@ -68,7 +68,7 @@ static int sttCompareEffect(const EffectInternal* p1, const EffectInternal* p2) if (result != 0) return result; - return _tcscmp(p1->getName(), p2->getName()); + return mir_tstrcmp(p1->getName(), p2->getName()); } OBJLIST effect_id_list(10, sttCompareEffect), effect_id_list_w2(10, sttCompareEffect), effect_id_list_w3(10, sttCompareEffect); @@ -264,12 +264,12 @@ static BOOL sttFsuiBindColourIdToFonts(HWND hwndList, const TCHAR *name, const T if (itemData && itemData->font_id >= 0) { FontInternal& F = font_id_list_w2[itemData->font_id]; - if (name && !_tcscmp(F.name, name)) { + if (name && !mir_tstrcmp(F.name, name)) { itemData->colour_id = colourId; res = TRUE; } - if (backgroundGroup && backgroundName && !_tcscmp(F.backgroundGroup, backgroundGroup) && !_tcscmp(F.backgroundName, backgroundName)) { + if (backgroundGroup && backgroundName && !mir_tstrcmp(F.backgroundGroup, backgroundGroup) && !mir_tstrcmp(F.backgroundName, backgroundName)) { itemData->colour_id = colourId; res = TRUE; } @@ -286,7 +286,7 @@ static bool sttFsuiBindEffectIdToFonts(HWND hwndList, const TCHAR *name, int eff if (itemData && itemData->font_id >= 0) { FontInternal& F = font_id_list_w2[itemData->font_id]; - if (name && !_tcscmp(F.name, name)) { + if (name && !mir_tstrcmp(F.name, name)) { itemData->effect_id = effectId; return true; } @@ -642,7 +642,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, SendDlgItemMessage(hwndDlg, IDC_FONTLIST, LB_ADDSTRING, (WPARAM)-1, (LPARAM)itemData); } - if (_tcscmp(C.name, _T("Background")) == 0) + if (mir_tstrcmp(C.name, _T("Background")) == 0) hBkgColourBrush = CreateSolidBrush(C.value); } } @@ -1031,7 +1031,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, if (itemData->colour_id < 0) continue; colour_id_list_w2[itemData->colour_id].value = SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_GETCOLOUR, 0, 0); - if (_tcscmp(colour_id_list_w2[itemData->colour_id].name, _T("Background")) == 0) { + if (mir_tstrcmp(colour_id_list_w2[itemData->colour_id].name, _T("Background")) == 0) { if (hBkgColourBrush) DeleteObject(hBkgColourBrush); hBkgColourBrush = CreateSolidBrush(colour_id_list_w2[itemData->colour_id].value); } -- cgit v1.2.3