new sorting functions applied

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

3 files changed, 13 insertions, 13 deletions

diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp
index 2b5f8ac7f3..909f02b885 100644
--- a/src/modules/skin/hotkey_opts.cpp
+++ b/src/modules/skin/hotkey_opts.cpp
@@ -246,23 +246,23 @@ static int CALLBACK sttOptionsSortList(LPARAM lParam1, LPARAM lParam2, LPARAM lP
 		item2 = (THotkeyItem *)lvi.lParam;
 
 	if (!item1 && !item2)
-		return lstrcmp(title1, title2);
+		return mir_tstrcmp(title1, title2);
 
 	if (!item1 && item2) {
-		if (res = lstrcmp(title1, item2->getSection()))
+		if (res = mir_tstrcmp(title1, item2->getSection()))
 			return res;
 		return -1;
 	}
 
 	if (!item2 && item1) {
-		if (res = lstrcmp(item1->getSection(), title2))
+		if (res = mir_tstrcmp(item1->getSection(), title2))
 			return res;
 		return 1;
 	}
 	/* item1 != NULL && item2 != NULL */
 
-	if (res = lstrcmp(item1->getSection(), item2->getSection())) return res;
-	if (res = lstrcmp(item1->getDescr(), item2->getDescr())) return res;
+	if (res = mir_tstrcmp(item1->getSection(), item2->getSection())) return res;
+	if (res = mir_tstrcmp(item1->getDescr(), item2->getDescr())) return res;
 	if (!item1->rootHotkey && item2->rootHotkey) return -1;
 	if (item1->rootHotkey && !item2->rootHotkey) return 1;
 	return 0;
@@ -357,7 +357,7 @@ static void sttBuildHotkeyList(HWND hwndList)
 		if (item->OptDeleted)
 			continue;
 
-		if (!i || lstrcmp(item->ptszSection, hotkeys[i-1]->ptszSection)) {
+		if (!i || mir_tstrcmp(item->ptszSection, hotkeys[i-1]->ptszSection)) {
 			lvi.mask = LVIF_TEXT|LVIF_PARAM;
 			lvi.iItem = nItems++;
 			lvi.iSubItem = 0;
@@ -872,7 +872,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 									ListView_GetItem(lpnmhdr->hwndFrom, &lvi);
 									item = (THotkeyItem *)lvi.lParam;
 									if (!item) continue;
-									if (!lstrcmp( item->getSection(), buf)) {
+									if (!mir_tstrcmp( item->getSection(), buf)) {
 										ListView_DeleteItem(lpnmhdr->hwndFrom, lvi.iItem);
 										--lvi.iItem;
 										--count;
@@ -887,7 +887,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 
 									if (item->OptDeleted)
 										continue;
-									if ( lstrcmp(buf, item->getSection()))
+									if ( mir_tstrcmp(buf, item->getSection()))
 										continue;
 
 									lvi.mask = LVIF_PARAM|LVIF_INDENT;
diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp
index adab1fda71..95f78a708c 100644
--- a/src/modules/skin/hotkeys.cpp
+++ b/src/modules/skin/hotkeys.cpp
@@ -29,9 +29,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static int sttCompareHotkeys(const THotkeyItem *p1, const THotkeyItem *p2)

 {

 	int res;

-	if (res = lstrcmp(p1->ptszSection, p2->ptszSection))

+	if (res = mir_tstrcmp(p1->ptszSection, p2->ptszSection))

 		return res;

-	if (res = lstrcmp(p1->ptszDescription, p2->ptszDescription))

+	if (res = mir_tstrcmp(p1->ptszDescription, p2->ptszDescription))

 		return res;

 	if (!p1->rootHotkey && p2->rootHotkey)

 		return -1;

@@ -228,7 +228,7 @@ static INT_PTR svcHotkeyUnregister(WPARAM, LPARAM lParam)
 		if (!pszCurrentName) continue;

 

 		hotkeys[i]->UnregisterHotkey =

-			!lstrcmpA(pszCurrentName, pszName)  ||

+			!mir_strcmp(pszCurrentName, pszName)  ||

 			!strncmp(pszCurrentName, pszNamePrefix, cbNamePrefix);

 	}

 

@@ -263,7 +263,7 @@ static INT_PTR svcHotkeyCheck(WPARAM wParam, LPARAM lParam)
 			for (i=0; i < hotkeys.getCount(); i++) {

 				THotkeyItem *item = hotkeys[i];

 				BYTE hkMod, hkVk;

-				if ((item->type != HKT_MANUAL) || lstrcmp(pszSection, item->ptszSection)) continue;

+				if ((item->type != HKT_MANUAL) || mir_tstrcmp(pszSection, item->ptszSection)) continue;

 				sttWordToModAndVk(item->Hotkey, &hkMod, &hkVk);

 				if (!hkVk) continue;

 				if (!item->Enabled) continue;

diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp
index e70f0ad2d6..02b09d1127 100644
--- a/src/modules/skin/sounds.cpp
+++ b/src/modules/skin/sounds.cpp
@@ -45,7 +45,7 @@ struct SoundItem
 

 static int CompareSounds(const SoundItem* p1, const SoundItem* p2)

 {

-	return lstrcmpA(p1->name, p2->name);

+	return mir_strcmp(p1->name, p2->name);

 }

 

 static OBJLIST<SoundItem> arSounds(10, CompareSounds);