new sorting functions applied

git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index 3821131aa1..eae9c3044f 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -734,7 +734,7 @@ static int LocateStorePosition(int Frameid,int maxstored)
 		if ( db_get_ts( NULL, CLUIFrameModule, settingname, &dbv ))

 			continue;

 

-		if ( lstrcmpi(dbv.ptszVal, g_pfwFrames[Frameid].name) == 0) {

+		if ( mir_tstrcmpi(dbv.ptszVal, g_pfwFrames[Frameid].name) == 0) {

 			db_free( &dbv );

 			return i;

 		}

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index e579ffe7dd..c234b7d400 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -322,7 +322,7 @@ static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const TCHAR
 				found = _tcsstr(lowered_szText, lowered_search) != NULL;
 			}
 			else {
-				found = ((prefixOk && CSTR_EQUAL == CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, text, -1, group->cl.items[group->scanIndex]->szText, testlen)) || (!prefixOk && !lstrcmpi(text, group->cl.items[group->scanIndex]->szText)));
+				found = ((prefixOk && CSTR_EQUAL == CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, text, -1, group->cl.items[group->scanIndex]->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, group->cl.items[group->scanIndex]->szText)));
 			}
 			if (found) {
 				ClcGroup *contactGroup = group;
@@ -1732,7 +1732,7 @@ int ClcDoProtoAck(MCONTACT wParam, ACKDATA * ack)
 	if (ack->type == ACKTYPE_STATUS) {
 		if (ack->result == ACKRESULT_SUCCESS) {
 			for (int i = 0; i < pcli->hClcProtoCount; i++) {
-				if (!lstrcmpA(pcli->clcProto[i].szProto, ack->szModule)) {
+				if (!mir_strcmp(pcli->clcProto[i].szProto, ack->szModule)) {
 					pcli->clcProto[i].dwStatus = (WORD)ack->lParam;
 					if (pcli->clcProto[i].dwStatus >= ID_STATUS_OFFLINE)
 						pcli->pfnTrayIconUpdateBase(pcli->clcProto[i].szProto);
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 96eb839186..3823497854 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -105,7 +105,7 @@ ClcGroup* cli_AddGroup(HWND hwnd, ClcData *dat, const TCHAR *szName, DWORD flags
 {
 	ClearRowByIndexCache();
 	if (!dat->force_in_dialog && !(GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN))
-		if (!lstrcmp(_T("-@-HIDDEN-GROUP-@-"), szName)) { //group is hidden
+		if (!mir_tstrcmp(_T("-@-HIDDEN-GROUP-@-"), szName)) { //group is hidden
 			ClearRowByIndexCache();
 			return NULL;
 		}
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 42d4cfe939..441afca9d5 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -369,7 +369,7 @@ int   CLCPaint::_GetRealStatus( ClcContact *pContact, int nStatus )
 

 	for ( int i=0; i < pcli->hClcProtoCount; i++ )

 	{

-		if (!lstrcmpA( pcli->clcProto[i].szProto, pContact->proto ))

+		if (!mir_strcmp( pcli->clcProto[i].szProto, pContact->proto ))

 			return pcli->clcProto[i].dwStatus;

 	}

 	return nStatus;

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index f23dc89266..865edfe98d 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -745,7 +745,7 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk)
 				TCHAR *lowered_text = CharLowerW(NEWTSTR_ALLOCA(text));

 				found = _tcsstr(lowered_szText, lowered_text) != NULL;

 			}

-			else found = (prefixOk && !_tcsnicmp(text, contact->szText, testlen)) || (!prefixOk && !lstrcmpi(text, contact->szText));

+			else found = (prefixOk && !_tcsnicmp(text, contact->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, contact->szText));

 

 			if (found) {

 				ClcGroup *contactGroup = group;

@@ -775,7 +775,7 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk)
 						TCHAR *lowered_text = CharLowerW(NEWTSTR_ALLOCA(text));

 						found = _tcsstr(lowered_szText, lowered_text) != NULL;

 					}

-					else found = (prefixOk && !_tcsnicmp(text, subcontact->szText, testlen)) || (!prefixOk && !lstrcmpi(text, subcontact->szText));

+					else found = (prefixOk && !_tcsnicmp(text, subcontact->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, subcontact->szText));

 

 					if (found) {

 						ClcGroup *contactGroup = group;

diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index 7b9b62d0bf..0960825202 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -305,7 +305,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY)
 					if (hAuxOld == hAux) {

 						TCHAR buf[255];

 						GetClassName(hAux, buf, SIZEOF(buf));

-						if (!lstrcmp(buf, CLUIFrameSubContainerClassName)) {

+						if (!mir_tstrcmp(buf, CLUIFrameSubContainerClassName)) {

 							hWndFound = TRUE;

 							break;

 						}

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index c9491636b9..b881e2b57c 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -349,7 +349,7 @@ LBL_Unknown:
 	}

 

 	tszName = pcli->pfnGetContactDisplayName(hContact, GCDNF_NOCACHE);

-	if (!lstrcmp(tszName, UnknownConctactTranslatedName)) {

+	if (!mir_tstrcmp(tszName, UnknownConctactTranslatedName)) {

 		mir_free(tszName);

 		goto LBL_Unknown;

 	}

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index dc5f07d995..bb64d2635b 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -199,7 +199,7 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam)
 	HWND hwndClist = GetFocus();

 	TCHAR cls[128];

 	GetClassName(hwndClist, cls, SIZEOF(cls));

-	if (lstrcmp(_T(CLISTCONTROL_CLASS), cls))

+	if (mir_tstrcmp(_T(CLISTCONTROL_CLASS), cls))

 		hwndClist = pcli->hwndContactList;

 

 	MCONTACT hItem = (MCONTACT)SendMessage(hwndClist, CLM_GETSELECTION, 0, 0);

diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 7f5728783f..39108c1c96 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -3685,7 +3685,7 @@ static TCHAR *ske_ReAppend(TCHAR *lfirst, TCHAR * lsecond, int len)
 TCHAR* ske_ReplaceVar(TCHAR *var)
 {
 	if (!var) return mir_tstrdup(_T(""));
-	if (!lstrcmpi(var,_T("Profile"))) {
+	if (!mir_tstrcmpi(var,_T("Profile"))) {
 		char buf[MAX_PATH] = {0};
 		CallService(MS_DB_GETPROFILENAME,(WPARAM)MAX_PATH,(LPARAM)buf);