summaryrefslogtreecommitdiff
path: root/src/modules/fonts
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-05-22 12:49:22 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-05-22 12:49:22 +0000
commitb280d2eae93fb22b4fdb45218d8a06287a97030e (patch)
treef4e0d9921a57bafdb608a55a107bad3408b8f909 /src/modules/fonts
parent159b565b390687258ee65a3b66596e118752063c (diff)
replace _tcscmp to mir_tstrcmp
git-svn-id: http://svn.miranda-ng.org/main/trunk@13753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/fonts')
-rw-r--r--src/modules/fonts/FontOptions.cpp22
-rw-r--r--src/modules/fonts/services.cpp6
2 files changed, 14 insertions, 14 deletions
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<FontInternal> 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<ColourInternal> 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<EffectInternal> 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);
}
diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp
index 5462b2a5b3..b02a4f7c82 100644
--- a/src/modules/fonts/services.cpp
+++ b/src/modules/fonts/services.cpp
@@ -347,7 +347,7 @@ static INT_PTR sttRegisterColourWorker(ColourIDW *colour_id, int hLangpack)
for (int i = 0; i < colour_id_list.getCount(); i++) {
ColourInternal& C = colour_id_list[i];
- if (!_tcscmp(C.group, colour_id->group) && !_tcscmp(C.name, colour_id->name))
+ if (!mir_tstrcmp(C.group, colour_id->group) && !mir_tstrcmp(C.name, colour_id->name))
return 1;
}
@@ -379,7 +379,7 @@ static INT_PTR sttGetColourWorker(ColourIDW *colour_id)
{
for (int i = 0; i < colour_id_list.getCount(); i++) {
ColourInternal& C = colour_id_list[i];
- if (!_tcscmp(C.group, colour_id->group) && !_tcscmp(C.name, colour_id->name))
+ if (!mir_tstrcmp(C.group, colour_id->group) && !mir_tstrcmp(C.name, colour_id->name))
return db_get_dw(NULL, C.dbSettingsGroup, C.setting, C.defcolour);
}
@@ -433,7 +433,7 @@ static INT_PTR sttRegisterEffectWorker(EffectIDW *effect_id, int hLangpack)
for (int i = 0; i < effect_id_list.getCount(); i++) {
EffectInternal& E = effect_id_list[i];
- if (!_tcscmp(E.group, effect_id->group) && !_tcscmp(E.name, effect_id->name))
+ if (!mir_tstrcmp(E.group, effect_id->group) && !mir_tstrcmp(E.name, effect_id->name))
return 1;
}