diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 19:23:27 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 19:23:27 +0000 |
commit | 1eb922f8075c53a1a8487045b096693bd27b56dd (patch) | |
tree | 2e4ec55f37aaa42d1f93d8a58fcde6c74b2025bb /plugins | |
parent | e2d7ebd6315a810bd4ea54f1088b84d09c3ca5d2 (diff) |
replace _tcsicmp to mir_tstrcmpi
git-svn-id: http://svn.miranda-ng.org/main/trunk@13761 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
28 files changed, 74 insertions, 74 deletions
diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index f9918523c0..c6fdf3c5d1 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -340,7 +340,7 @@ MCONTACT GetContactFromID(TCHAR *szID, char *szProto) tmp = (char *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0);
STRNCPY(dispName, tmp, sizeof(dispName));
- if ((szHandle) && ((_tcsicmp(szHandle, szID) == 0) || (_tcsicmp(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))
+ if ((szHandle) && ((mir_tstrcmpi(szHandle, szID) == 0) || (mir_tstrcmpi(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))
found = 1;
free(szHandle);
diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index 6891a41e62..8cd63e612a 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -261,7 +261,7 @@ static void GetPluginsString(CMString& buffer, unsigned& flags) else
lsttmppv->next = lst;
- if (_tcsicmp(FindFileData.cFileName, TEXT("weather.dll")) == 0)
+ if (mir_tstrcmpi(FindFileData.cFileName, TEXT("weather.dll")) == 0)
flags |= VI_FLAG_WEATHER;
++count;
diff --git a/plugins/DbChecker/src/selectdb.cpp b/plugins/DbChecker/src/selectdb.cpp index 74417f1c12..12cd47105b 100644 --- a/plugins/DbChecker/src/selectdb.cpp +++ b/plugins/DbChecker/src/selectdb.cpp @@ -95,7 +95,7 @@ static int AddDatabaseToList(HWND hwndList, const TCHAR* filename, TCHAR* dir) lvi.iSubItem = 0;
for (lvi.iItem = ListView_GetItemCount(hwndList) - 1; lvi.iItem >= 0; lvi.iItem--) {
ListView_GetItem(hwndList, &lvi);
- if (!_tcsicmp((TCHAR*)lvi.lParam, filename))
+ if (!mir_tstrcmpi((TCHAR*)lvi.lParam, filename))
return lvi.iItem;
}
@@ -117,7 +117,7 @@ static int AddDatabaseToList(HWND hwndList, const TCHAR* filename, TCHAR* dir) mir_sntprintf(szName, SIZEOF(szName), _T("%s%s"), dir, pName);
TCHAR *pDot = _tcsrchr(szName, '.');
- if (pDot != NULL && !_tcsicmp(pDot, _T(".dat")))
+ if (pDot != NULL && !mir_tstrcmpi(pDot, _T(".dat")))
*pDot = 0;
lvi.iItem = 0;
diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp index f9f96e426a..6b23e41586 100644 --- a/plugins/DbEditorPP/src/settinglist.cpp +++ b/plugins/DbEditorPP/src/settinglist.cpp @@ -661,7 +661,7 @@ INT_PTR CALLBACK SettingsCompare(LPARAM lParam1, LPARAM lParam2, LPARAM myParam) ListView_GetItemText(params.hList, lParam1, params.column, text1, SIZEOF(text1));
ListView_GetItemText(params.hList, lParam2, params.column, text2, SIZEOF(text2));
- int res = _tcsicmp(text1, text2);
+ int res = mir_tstrcmpi(text1, text2);
res = (params.column == lastColumn) ? -res : res;
return res;
}
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 29320fed7e..7cf271a2b3 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -46,7 +46,7 @@ static void SearchForLists(HWND hwndDlg, const TCHAR *mirandaPath, const TCHAR * continue;
// skip the current profile too
- if (mirandaProf != NULL && !_tcsicmp(mirandaProf, fd.cFileName))
+ if (mirandaProf != NULL && !mir_tstrcmpi(mirandaProf, fd.cFileName))
continue;
TCHAR buf[MAX_PATH], profile[MAX_PATH];
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp index 435ebd3db8..11febc29b1 100644 --- a/plugins/MirandaG15/src/CAppletManager.cpp +++ b/plugins/MirandaG15/src/CAppletManager.cpp @@ -1171,7 +1171,7 @@ int CAppletManager::HookChatInbound(WPARAM wParam,LPARAM lParam) // fetch the network name if(gcd->iType == GC_EVENT_CHANGESESSIONAME) { - if (gcd->ptszID && !_tcsicmp(gcd->ptszID,_T("Network log"))) + if (gcd->ptszID && !mir_tstrcmpi(gcd->ptszID,_T("Network log"))) { pIRCCon->strNetwork = toTstring(gce->ptszText); TRACE(_T("\t Found network identifier: %s\n"),pIRCCon->strNetwork.c_str()); @@ -1196,7 +1196,7 @@ int CAppletManager::HookChatInbound(WPARAM wParam,LPARAM lParam) strChannel = strChannel.substr(0,pos-1); else { - if(_tcsicmp(gcd->ptszID,_T("Network log"))) + if(mir_tstrcmpi(gcd->ptszID,_T("Network log"))) TRACE(_T("\t WARNING: ignoring unknown event!\n")); return 0; } diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index f8c73e78bd..7b99448c12 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -505,7 +505,7 @@ bool CContactList::CompareEntries(CListEntry<CContactListEntry*,CContactListGrou else if(pLeftEntry->iStatus != pRightEntry->iStatus)
return (aiStatusPriority[pLeftEntry->iStatus - ID_STATUS_OFFLINE] > aiStatusPriority[pRightEntry->iStatus - ID_STATUS_OFFLINE]);
else
- return _tcsicmp(pLeftEntry->strName.c_str(),pRightEntry->strName.c_str())<0;
+ return mir_tstrcmpi(pLeftEntry->strName.c_str(),pRightEntry->strName.c_str())<0;
}
else if(pLeft->GetType() == ITEM && pRight->GetType() == CONTAINER)
return false;
@@ -523,7 +523,7 @@ bool CContactList::CompareEntries(CListEntry<CContactListEntry*,CContactListGrou else if (pGroup1->iEvents && pGroup2->iEvents)
return (pGroup1->iEvents > pGroup2->iEvents);
else
- return _tcsicmp(pGroup1->strName.c_str(),pGroup2->strName.c_str())<0;
+ return mir_tstrcmpi(pGroup1->strName.c_str(),pGroup2->strName.c_str())<0;
}
return false;
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index d8286b8d08..fcbb410790 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -537,7 +537,7 @@ INT_PTR srvVariablesHandler(WPARAM, LPARAM lParam) TreeCtrl->DBToMem(CString(MOD_NAME));
for (int i = 0; i < TreeCtrl->Value.GetSize(); i++) {
- if (!(TreeCtrl->Value[i].Flags & TIF_GROUP) && !_tcsicmp(TreeCtrl->Value[i].Title, ai->targv[1])) {
+ if (!(TreeCtrl->Value[i].Flags & TIF_GROUP) && !mir_tstrcmpi(TreeCtrl->Value[i].Title, ai->targv[1])) {
Result = TreeCtrl->Value[i].User_Str1;
break;
}
diff --git a/plugins/NewAwaySysMod/src/Client.cpp b/plugins/NewAwaySysMod/src/Client.cpp index 6eb74afad8..74244b3d60 100644 --- a/plugins/NewAwaySysMod/src/Client.cpp +++ b/plugins/NewAwaySysMod/src/Client.cpp @@ -146,7 +146,7 @@ int GetRecentGroupID(int iMode) return g_Messages_RecentRootID;
for (int Order = 0; Order < TreeCtrl->Value.GetSize(); Order++) // find a group named accordingly to the current status
- if (TreeCtrl->Value[Order].ParentID == g_Messages_RecentRootID && TreeCtrl->Value[Order].Flags & TIF_GROUP && !_tcsicmp(TreeCtrl->Value[Order].Title, iMode ? pcli->pfnGetStatusModeDescription(iMode, 0) : MSGTREE_RECENT_OTHERGROUP))
+ if (TreeCtrl->Value[Order].ParentID == g_Messages_RecentRootID && TreeCtrl->Value[Order].Flags & TIF_GROUP && !mir_tstrcmpi(TreeCtrl->Value[Order].Title, iMode ? pcli->pfnGetStatusModeDescription(iMode, 0) : MSGTREE_RECENT_OTHERGROUP))
return TreeCtrl->Value[Order].ID;
return -1;
diff --git a/plugins/Quotes/src/stdafx.h b/plugins/Quotes/src/stdafx.h index 4096f1c191..fe6920d233 100644 --- a/plugins/Quotes/src/stdafx.h +++ b/plugins/Quotes/src/stdafx.h @@ -79,7 +79,7 @@ inline tstring quotes_a2t(const char* s) inline int quotes_stricmp(LPCTSTR p1, LPCTSTR p2)
{
- return _tcsicmp(p1, p2);
+ return mir_tstrcmpi(p1, p2);
}
#include "resource.h"
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp index ddbf45184d..407a953d9a 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.cpp +++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp @@ -1061,7 +1061,7 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) { //TCHAR* pszFormat = (TCHAR*)ComboBox_GetItemData(hwndCombo, ComboBox_GetCurSel(hwndCombo)); TCHAR pszFormat[6]; ComboBox_GetText(hwndCombo, pszFormat, 6); - if(ret && (_tcsicmp (pszFormat,_T("png")) != 0)) { + if(ret && (mir_tstrcmpi (pszFormat,_T("png")) != 0)) { fif = FIP->FI_GetFIFFromFilenameU(ret); dib_new = FIP->FI_LoadU(fif, ret,0); diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index 41a3be4d18..70004c2454 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -158,7 +158,7 @@ static DWORD_PTR ConvertServiceParam(MCONTACT hContact, const TCHAR *param) DWORD_PTR ret;
if (param == NULL)
ret = 0;
- else if (_tcsicmp(_T("hContact"), param) == 0)
+ else if (mir_tstrcmpi(_T("hContact"), param) == 0)
ret = (DWORD_PTR)hContact;
else if (_istdigit(*param))
ret = _ttoi(param);
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 2878bb767f..7d11d89daf 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -178,7 +178,7 @@ static int TSAPI RescanSkins(HWND hwndCombobox) for (int i = 1; i < lr; i++) {
TCHAR *idata = (TCHAR*)SendMessage(hwndCombobox, CB_GETITEMDATA, i, 0);
if (idata && idata != (TCHAR*)CB_ERR) {
- if (!_tcsicmp(dbv.ptszVal, idata)) {
+ if (!mir_tstrcmpi(dbv.ptszVal, idata)) {
SendMessage(hwndCombobox, CB_SETCURSEL, i, 0);
break;
}
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 636fd00b8c..5ed8009722 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1208,7 +1208,7 @@ void CSkin::LoadIcon(const TCHAR *szSection, const TCHAR *name, HICON &hIcon) GetPrivateProfileString(szSection, name, _T("none"), buffer, 250, m_tszFileName);
buffer[500] = 0;
- if (_tcsicmp(buffer, _T("none"))) {
+ if (mir_tstrcmpi(buffer, _T("none"))) {
TCHAR szDrive[MAX_PATH], szDir[MAX_PATH], szImagePath[MAX_PATH];
_tsplitpath(m_tszFileName, szDrive, szDir, NULL, NULL);
@@ -1303,7 +1303,7 @@ void CSkin::ReadImageItem(const TCHAR *itemname) TCHAR *szImageFileName = tmpItem.Read(m_tszFileName);
- if (!_tcsicmp(itemname, _T("$glyphs")) && szImageFileName != 0) { // the glyph item MUST have a valid image
+ if (!mir_tstrcmpi(itemname, _T("$glyphs")) && szImageFileName != 0) { // the glyph item MUST have a valid image
tmpItem.Create(szImageFileName);
if (tmpItem.getHbm()) {
m_glyphItem = tmpItem;
@@ -1321,7 +1321,7 @@ void CSkin::ReadImageItem(const TCHAR *itemname) if (!mir_tstrcmp(buffer, _T("None")))
break;
for (int i = 0; i <= ID_EXTBK_LAST; i++) {
- if (!_tcsicmp(SkinItems[i].szName[0] == '{' ? &SkinItems[i].szName[3] : SkinItems[i].szName, buffer)) {
+ if (!mir_tstrcmpi(SkinItems[i].szName[0] == '{' ? &SkinItems[i].szName[3] : SkinItems[i].szName, buffer)) {
if (!(tmpItem.getFlags() & IMAGE_GLYPH)) {
if (szImageFileName)
tmpItem.Create(szImageFileName);
@@ -1416,7 +1416,7 @@ void CSkin::Load(void) continue;
}
for (i = 0; i <= ID_EXTBK_LAST; i++) {
- if (!_tcsicmp(&p[1], SkinItems[i].szName[0] == '{' ? &SkinItems[i].szName[3] : SkinItems[i].szName)) {
+ if (!mir_tstrcmpi(&p[1], SkinItems[i].szName[0] == '{' ? &SkinItems[i].szName[3] : SkinItems[i].szName)) {
ReadItem(i, p);
break;
}
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 7a487842db..4b05346c66 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -769,7 +769,7 @@ class CAnnivList // add anniversaries
if (_filter.bFilterIndex != FILTER_BIRTHDAY && (!_filter.pszProto || !_strcmpi(pszProto, _filter.pszProto)))
for (i = 0; !ad.DBGetAnniversaryDate(hContact, i); i++)
- if (!_filter.pszAnniv || !_tcsicmp(_filter.pszAnniv, ad.Description()))
+ if (!_filter.pszAnniv || !mir_tstrcmpi(_filter.pszAnniv, ad.Description()))
AddRow(hContact, pszProto, ad, mtNow, wDaysBefore);
}
}
diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp index f22af82f76..44fa7e62e3 100644 --- a/plugins/UserInfoEx/src/psp_anniversary.cpp +++ b/plugins/UserInfoEx/src/psp_anniversary.cpp @@ -85,7 +85,7 @@ static INT_PTR CALLBACK DlgProc_AnniversaryEditor(HWND hDlg, UINT uMsg, WPARAM w break;
}
- if (_tcsicmp(pszText, pDlgEditAnniv->Description())) {
+ if (mir_tstrcmpi(pszText, pDlgEditAnniv->Description())) {
pDlgEditAnniv->Description(pszText);
pDlgEditAnniv->SetFlags(MAnnivDate::MADF_HASCUSTOM | MAnnivDate::MADF_CHANGED);
}
diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp index a4d49edbeb..fb82f07b18 100644 --- a/plugins/UserInfoEx/src/svc_timezone_old.cpp +++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp @@ -124,7 +124,7 @@ class CTzMgr : public LIST<CTimeZone> static int sortFunc(const CTimeZone *tz1, const CTimeZone *tz2)
{
// DO NOT USE mir_tcsicmp here as it does only return TRUE or FALSE!!!
- return _tcsicmp(tz1->ptszName, tz2->ptszName);
+ return mir_tstrcmpi(tz1->ptszName, tz2->ptszName);
}
/**
diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp index 100b599a1d..22abffcfd3 100644 --- a/plugins/Variables/src/help.cpp +++ b/plugins/Variables/src/help.cpp @@ -447,7 +447,7 @@ static BOOL CALLBACK processTokenListMessage(HWND hwndDlg, UINT msg, WPARAM wPar } else text = NULL; - if (text != NULL && (last == NULL || _tcsicmp(last, text))) { + if (text != NULL && (last == NULL || mir_tstrcmpi(last, text))) { lvItem.mask = LVIF_TEXT; lvItem.pszText = text; ListView_InsertItem(hList, &lvItem); diff --git a/plugins/Variables/src/parse_str.cpp b/plugins/Variables/src/parse_str.cpp index 225ed37751..d7e797c830 100644 --- a/plugins/Variables/src/parse_str.cpp +++ b/plugins/Variables/src/parse_str.cpp @@ -542,7 +542,7 @@ static TCHAR *parseStricmp(ARGUMENTSINFO *ai) if (ai->argc != 3)
return NULL;
- if (_tcsicmp(ai->targv[1], ai->targv[2]))
+ if (mir_tstrcmpi(ai->targv[1], ai->targv[2]))
ai->flags |= AIF_FALSE;
return mir_tstrdup(_T(""));
diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index cede7efbf4..5f2fd10f6b 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -46,12 +46,12 @@ INT_PTR WeatherAddToList(WPARAM wParam, LPARAM lParam) DBVARIANT dbv;
// check ID to see if the contact already exist in the database
if ( !db_get_ts(hContact, WEATHERPROTONAME, "ID", &dbv)) {
- if ( !_tcsicmp(psr->email, dbv.ptszVal)) {
+ if ( !mir_tstrcmpi(psr->email, dbv.ptszVal)) {
// remove the flag for not on list and hidden, thus make the contact visible
// and add them on the list
if (db_get_b(hContact, "CList", "NotOnList", 1)) {
db_unset(hContact, "CList", "NotOnList");
- db_unset(hContact, "CList", "Hidden");
+ db_unset(hContact, "CList", "Hidden");
}
db_free(&dbv);
// contact is added, function quitting
@@ -322,13 +322,13 @@ int NameSearchProc(TCHAR *name, const int searchId, WINAMESEARCH *sData, TCHAR * // for single result
if (sData->Single.Available && (search != NULL || !sData->Multiple.Available)) { // single result
// if station ID appears first in the downloaded data
- if ( !_tcsicmp(sData->Single.First, _T("ID"))) {
+ if ( !mir_tstrcmpi(sData->Single.First, _T("ID"))) {
GetDataValue(&sData->Single.ID, str, &szInfo);
mir_sntprintf(sID, SIZEOF(sID), _T("%s/%s"), svc, str);
GetDataValue(&sData->Single.Name, Name, &szInfo);
}
// if station name appears first in the downloaded data
- else if ( !_tcsicmp(sData->Single.First, _T("NAME"))) {
+ else if ( !mir_tstrcmpi(sData->Single.First, _T("NAME"))) {
GetDataValue(&sData->Single.Name, Name, &szInfo);
GetDataValue(&sData->Single.ID, str, &szInfo);
mir_sntprintf(sID, SIZEOF(sID), _T("%s/%s"), svc, str);
@@ -363,13 +363,13 @@ int NameSearchProc(TCHAR *name, const int searchId, WINAMESEARCH *sData, TCHAR * // search for the next occurrence of the string
while (true) {
// if station ID appears first in the downloaded data
- if ( !_tcsicmp(sData->Multiple.First, _T("ID"))) {
+ if ( !mir_tstrcmpi(sData->Multiple.First, _T("ID"))) {
GetDataValue(&sData->Multiple.ID, str, &szInfo);
mir_sntprintf(sID, SIZEOF(sID), _T("%s/%s"), svc, str);
GetDataValue(&sData->Multiple.Name, Name, &szInfo);
}
// if station name appears first in the downloaded data
- else if ( !_tcsicmp(sData->Multiple.First, _T("NAME"))) {
+ else if ( !mir_tstrcmpi(sData->Multiple.First, _T("NAME"))) {
GetDataValue(&sData->Multiple.Name, Name, &szInfo);
GetDataValue(&sData->Multiple.ID, str, &szInfo);
mir_sntprintf(sID, SIZEOF(sID), _T("%s/%s"), svc, str);
diff --git a/plugins/Weather/src/weather_conv.cpp b/plugins/Weather/src/weather_conv.cpp index b8cbb97f95..7d73d76fed 100644 --- a/plugins/Weather/src/weather_conv.cpp +++ b/plugins/Weather/src/weather_conv.cpp @@ -100,8 +100,8 @@ void GetTemp(TCHAR *tempchar, TCHAR *unit, TCHAR* str) temp = _ttof(tempchar);
// convert all to F first
- if ( !_tcsicmp(unit, _T("C"))) temp = (temp*9/5)+32;
- else if ( !_tcsicmp(unit, _T("K"))) temp = ((temp-273.15)*9/5)+32;
+ if ( !mir_tstrcmpi(unit, _T("C"))) temp = (temp*9/5)+32;
+ else if ( !mir_tstrcmpi(unit, _T("K"))) temp = ((temp-273.15)*9/5)+32;
// convert to apporiate unit
switch (opt.tUnit) {
@@ -143,17 +143,17 @@ void GetPressure(TCHAR *tempchar, TCHAR *unit, TCHAR* str) }
// convert all to mb first
- if ( !_tcsicmp(unit, _T("KPA")))
+ if ( !mir_tstrcmpi(unit, _T("KPA")))
tempunit = (double)output * 10;
- else if ( !_tcsicmp(unit, _T("HPA")))
+ else if ( !mir_tstrcmpi(unit, _T("HPA")))
tempunit = (double)output;
- else if ( !_tcsicmp(unit, _T("MB")))
+ else if ( !mir_tstrcmpi(unit, _T("MB")))
tempunit = (double)output;
- else if ( !_tcsicmp(unit, _T("IN")))
+ else if ( !mir_tstrcmpi(unit, _T("IN")))
tempunit = (double)output * 33.86388;
- else if ( !_tcsicmp(unit, _T("MM")))
+ else if ( !mir_tstrcmpi(unit, _T("MM")))
tempunit = (double)output * 1.33322;
- else if ( !_tcsicmp(unit, _T("TORR")))
+ else if ( !mir_tstrcmpi(unit, _T("TORR")))
tempunit = (double)output * 1.33322;
// convert to apporiate unit
@@ -200,13 +200,13 @@ void GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str) return;
// convert all to m/s first
- if ( !_tcsicmp(unit, _T("KM/H")))
+ if ( !mir_tstrcmpi(unit, _T("KM/H")))
tempunit /= 3.6;
-// else if ( !_tcsicmp(unit, _T("M/S"))
+// else if ( !mir_tstrcmpi(unit, _T("M/S"))
// tempunit = tempunit;
- else if ( !_tcsicmp(unit, _T("MPH")))
+ else if ( !mir_tstrcmpi(unit, _T("MPH")))
tempunit *= 0.44704;
- else if ( !_tcsicmp(unit, _T("KNOTS")))
+ else if ( !mir_tstrcmpi(unit, _T("KNOTS")))
tempunit *= 0.514444;
// convert to apporiate unit
@@ -249,9 +249,9 @@ void GetDist(TCHAR *tempchar, TCHAR *unit, TCHAR *str) }
// convert all to km first
- if ( !_tcsicmp(unit, _T("KM")))
+ if ( !mir_tstrcmpi(unit, _T("KM")))
tempunit = (double)output;
- else if ( !_tcsicmp(unit, _T("MILES")))
+ else if ( !mir_tstrcmpi(unit, _T("MILES")))
tempunit = (double)output * 1.609;
// convert to apporiate unit
@@ -289,9 +289,9 @@ void GetElev(TCHAR *tempchar, TCHAR *unit, TCHAR *str) }
// convert all to m first
- if ( !_tcsicmp(unit, _T("M")))
+ if ( !mir_tstrcmpi(unit, _T("M")))
tempunit = (double)output;
- else if ( !_tcsicmp(unit, _T("FT")))
+ else if ( !mir_tstrcmpi(unit, _T("FT")))
tempunit = (double)output / 3.28;
// convert to apporiate unit
diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index 02ee823423..81175f2ea4 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -200,58 +200,58 @@ void ConvertDataValue(WIDATAITEM *UpdateData, TCHAR *Data) if ( !mir_tstrcmp(UpdateData->Name, _T("Temperature")) || !mir_tstrcmp(UpdateData->Name, _T("High")) ||
!mir_tstrcmp(UpdateData->Name, _T("Low")) || !mir_tstrcmp(UpdateData->Name, _T("Feel")) ||
!mir_tstrcmp(UpdateData->Name, _T("Dewpoint")) ||
- !_tcsicmp(UpdateData->Unit, _T("C")) || !_tcsicmp(UpdateData->Unit, _T("F")) ||
- !_tcsicmp(UpdateData->Unit, _T("K")))
+ !mir_tstrcmpi(UpdateData->Unit, _T("C")) || !mir_tstrcmpi(UpdateData->Unit, _T("F")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("K")))
{
GetTemp(Data, UpdateData->Unit, str);
_tcscpy(Data, str);
}
// pressure
- else if ( !mir_tstrcmp(UpdateData->Name, _T("Pressure")) || !_tcsicmp(UpdateData->Unit, _T("HPA")) ||
- !_tcsicmp(UpdateData->Unit, _T("KPA")) || !_tcsicmp(UpdateData->Unit, _T("MB")) ||
- !_tcsicmp(UpdateData->Unit, _T("TORR")) || !_tcsicmp(UpdateData->Unit, _T("IN")) ||
- !_tcsicmp(UpdateData->Unit, _T("MM")))
+ else if ( !mir_tstrcmp(UpdateData->Name, _T("Pressure")) || !mir_tstrcmpi(UpdateData->Unit, _T("HPA")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("KPA")) || !mir_tstrcmpi(UpdateData->Unit, _T("MB")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("TORR")) || !mir_tstrcmpi(UpdateData->Unit, _T("IN")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("MM")))
{
GetPressure(Data, UpdateData->Unit, str);
_tcscpy(Data, str);
}
// speed
- else if ( !mir_tstrcmp(UpdateData->Name, _T("Wind Speed")) || !_tcsicmp(UpdateData->Unit, _T("KM/H")) ||
- !_tcsicmp(UpdateData->Unit, _T("M/S")) || !_tcsicmp(UpdateData->Unit, _T("MPH")) ||
- !_tcsicmp(UpdateData->Unit, _T("KNOTS")))
+ else if ( !mir_tstrcmp(UpdateData->Name, _T("Wind Speed")) || !mir_tstrcmpi(UpdateData->Unit, _T("KM/H")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("M/S")) || !mir_tstrcmpi(UpdateData->Unit, _T("MPH")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("KNOTS")))
{
GetSpeed(Data, UpdateData->Unit, str);
_tcscpy(Data, str);
}
// visibility
- else if ( !mir_tstrcmp(UpdateData->Name, _T("Visibility")) || !_tcsicmp(UpdateData->Unit, _T("KM")) ||
- !_tcsicmp(UpdateData->Unit, _T("MILES")))
+ else if ( !mir_tstrcmp(UpdateData->Name, _T("Visibility")) || !mir_tstrcmpi(UpdateData->Unit, _T("KM")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("MILES")))
{
GetDist(Data, UpdateData->Unit, str);
_tcscpy(Data, str);
}
// elevation
- else if ( !mir_tstrcmp(UpdateData->Name, _T("Elevation")) || !_tcsicmp(UpdateData->Unit, _T("FT")) ||
- !_tcsicmp(UpdateData->Unit, _T("M")))
+ else if ( !mir_tstrcmp(UpdateData->Name, _T("Elevation")) || !mir_tstrcmpi(UpdateData->Unit, _T("FT")) ||
+ !mir_tstrcmpi(UpdateData->Unit, _T("M")))
{
GetElev(Data, UpdateData->Unit, str);
_tcscpy(Data, str);
}
// converting case for condition to the upper+lower format
- else if ( !_tcsicmp(UpdateData->Unit, _T("COND")))
+ else if ( !mir_tstrcmpi(UpdateData->Unit, _T("COND")))
CaseConv(Data);
// degree sign
- else if ( !_tcsicmp(UpdateData->Unit, _T("DEG")))
+ else if ( !mir_tstrcmpi(UpdateData->Unit, _T("DEG")))
{
if ( !opt.DoNotAppendUnit) _tcscat(Data, opt.DegreeSign);
}
// percent sign
- else if ( !_tcsicmp(UpdateData->Unit, _T("%")))
+ else if ( !mir_tstrcmpi(UpdateData->Unit, _T("%")))
{
if ( !opt.DoNotAppendUnit) _tcscat(Data, _T("%"));
}
// truncating strings for day/month to 2 or 3 characters
- else if ( !_tcsicmp(UpdateData->Unit, _T("DAY")) || !_tcsicmp(UpdateData->Unit, _T("MONTH")))
+ else if ( !mir_tstrcmpi(UpdateData->Unit, _T("DAY")) || !mir_tstrcmpi(UpdateData->Unit, _T("MONTH")))
if (opt.dUnit > 1 && mir_tstrlen(Data) > opt.dUnit)
Data[opt.dUnit] = '\0';
}
diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp index e563353491..812ec987f3 100644 --- a/plugins/Weather/src/weather_ini.cpp +++ b/plugins/Weather/src/weather_ini.cpp @@ -196,7 +196,7 @@ bool LoadWIData(bool dial) chop = _tcsrchr(FileName, '\\');
chop[1] = '\0';
_tcsncat(FileName, fd.cFileName, SIZEOF(FileName) - mir_tstrlen(FileName));
- if ( _tcsicmp(fd.cFileName, _T("SAMPLE_INI.INI"))) {
+ if ( mir_tstrcmpi(fd.cFileName, _T("SAMPLE_INI.INI"))) {
WIDATA Data;
LoadStationData(FileName, fd.cFileName, &Data);
if (Data.Enabled)
diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index fc94299a79..ffa4818c19 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -83,19 +83,19 @@ int UpdateWeather(MCONTACT hContact) // compare the old condition and determine if the weather had changed
if (opt.UpdateOnlyConditionChanged) { // consider condition change
if (!db_get_ts(hContact, WEATHERPROTONAME, "LastCondition", &dbv)) {
- if (_tcsicmp(winfo.cond, dbv.ptszVal)) Ch = TRUE; // the weather condition is changed
+ if (mir_tstrcmpi(winfo.cond, dbv.ptszVal)) Ch = TRUE; // the weather condition is changed
db_free(&dbv);
}
else Ch = TRUE;
if (!db_get_ts(hContact, WEATHERPROTONAME, "LastTemperature", &dbv)) {
- if (_tcsicmp(winfo.temp, dbv.ptszVal)) Ch = TRUE; // the temperature is changed
+ if (mir_tstrcmpi(winfo.temp, dbv.ptszVal)) Ch = TRUE; // the temperature is changed
db_free(&dbv);
}
else Ch = TRUE;
}
else { // consider update time change
if (!db_get_ts(hContact, WEATHERPROTONAME, "LastUpdate", &dbv)) {
- if (_tcsicmp(winfo.update, dbv.ptszVal)) Ch = TRUE; // the update time is changed
+ if (mir_tstrcmpi(winfo.update, dbv.ptszVal)) Ch = TRUE; // the update time is changed
db_free(&dbv);
}
else Ch = TRUE;
@@ -459,7 +459,7 @@ int GetWeatherData(MCONTACT hContact) // if it is a normal item with start= and end=, then parse through the downloaded string
// to get a data value.
GetDataValue(&Item->Item, DataValue, &szInfo);
- if ( mir_tstrcmp(Item->Item.Name, _T("Condition")) && _tcsicmp(Item->Item.Unit, _T("Cond")))
+ if ( mir_tstrcmp(Item->Item.Name, _T("Condition")) && mir_tstrcmpi(Item->Item.Unit, _T("Cond")))
_tcsncpy(DataValue, TranslateTS(DataValue), MAX_DATA_LEN - 1);
break;
@@ -562,7 +562,7 @@ int GetWeatherData(MCONTACT hContact) CharLowerBuff(DataValue, (DWORD)mir_tstrlen(DataValue));
cond = GetIcon(DataValue, Data);
}
- else if ( _tcsicmp(Item->Item.Unit, _T("Cond")) == 0) {
+ else if ( mir_tstrcmpi(Item->Item.Unit, _T("Cond")) == 0) {
TCHAR buf[128], *cbuf;
mir_sntprintf(buf, SIZEOF(buf), _T("#%s Weather"), DataValue);
cbuf = TranslateTS(buf);
diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index 04716317e4..caa6b711c2 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -561,7 +561,7 @@ INT_PTR CALLBACK BirthdaysCompare(LPARAM lParam1, LPARAM lParam2, LPARAM myParam else
res = (value1 != value2);
}
- else res = _tcsicmp(text1, text2);
+ else res = mir_tstrcmpi(text1, text2);
res = (params.column == lastColumn) ? -res : res;
return res;
diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index 37b4e9ef11..5ffcd81274 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -185,7 +185,7 @@ MCONTACT GetContactFromID(TCHAR *szID, char *szProto) char *m_szProto = GetContactProto(hContact);
TCHAR *szHandle = GetContactID(hContact, szProto);
if (szHandle) {
- bool found = (!_tcsicmp(szHandle, szID) && !_stricmp(szProto, m_szProto));
+ bool found = (!mir_tstrcmpi(szHandle, szID) && !_stricmp(szProto, m_szProto));
free(szHandle);
if (found)
return hContact;
diff --git a/plugins/YAPP/src/yapp_history_dlg.cpp b/plugins/YAPP/src/yapp_history_dlg.cpp index 1a3d083519..f98482dcdd 100644 --- a/plugins/YAPP/src/yapp_history_dlg.cpp +++ b/plugins/YAPP/src/yapp_history_dlg.cpp @@ -187,7 +187,7 @@ int CALLBACK PopupsCompare(LPARAM lParam1, LPARAM lParam2, LPARAM myParam) ListView_GetItemText(params.hList, (int) lParam1, params.column, text1, SIZEOF(text1));
ListView_GetItemText(params.hList, (int) lParam2, params.column, text2, SIZEOF(text2));
- res = _tcsicmp(text1, text2);
+ res = mir_tstrcmpi(text1, text2);
res = (params.column == lastColumn) ? -res : res; //do reverse search on second click on same column
diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp index a2306b69b2..36506bf4f2 100644 --- a/plugins/YahooGroups/src/utils.cpp +++ b/plugins/YahooGroups/src/utils.cpp @@ -329,7 +329,7 @@ MCONTACT GetContactFromID(TCHAR *szID, char *szProto) tmp = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);
_tcsncpy(dispName, tmp, SIZEOF(dispName));
- if ((szHandle) && ((_tcsicmp(szHandle, szID) == 0) || (_tcsicmp(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))
+ if ((szHandle) && ((mir_tstrcmpi(szHandle, szID) == 0) || (mir_tstrcmpi(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))
found = 1;
if (szHandle) { free(szHandle); }
|