diff options
author | George Hazan <george.hazan@gmail.com> | 2014-11-30 21:20:14 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-11-30 21:20:14 +0000 |
commit | d9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d (patch) | |
tree | a6f925c63bc31e4b4dba301183cc3b429d52d816 /plugins/StatusPlugins | |
parent | ce2d4f19e3f810b282eb7d47d470d426ff459e1f (diff) |
new sorting functions applied
git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/StatusPlugins')
4 files changed, 9 insertions, 9 deletions
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index 567feaea6d..33b130e1e7 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp @@ -34,7 +34,7 @@ int CompareSettings(const TAAAProtoSetting *p1, const TAAAProtoSetting *p2)
{
- return lstrcmpA(p1->szName, p2->szName);
+ return mir_strcmp(p1->szName, p2->szName);
}
TAAAProtoSettingList autoAwaySettings(10, CompareSettings);
@@ -198,7 +198,7 @@ int OnAccChanged(WPARAM wParam, LPARAM lParam) case PRAC_REMOVED:
for (int i = 0; i < autoAwaySettings.getCount(); i++) {
- if (!lstrcmpA(autoAwaySettings[i].szName, pa->szModuleName)) {
+ if (!mir_strcmp(autoAwaySettings[i].szName, pa->szModuleName)) {
autoAwaySettings.remove(i);
break;
}
diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp index d1b2192697..163e48f237 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp @@ -42,7 +42,7 @@ static HWND hMessageWindow = NULL; static int CompareConnections( const TConnectionSettings *p1, const TConnectionSettings *p2 ) { - return lstrcmpA( p1->szName, p2->szName ); + return mir_strcmp( p1->szName, p2->szName ); } static OBJLIST<TConnectionSettings> connectionSettings( 10, CompareConnections ); @@ -226,7 +226,7 @@ static int AssignStatus(TConnectionSettings* cs, int status, int lastStatus, TCH log_infoA("KeepStatus: assigning status %d to %s", cs->status, cs->szName); - if ( szMsg != NULL && lstrcmp(szMsg, cs->szMsg)) { + if ( szMsg != NULL && mir_tstrcmp(szMsg, cs->szMsg)) { if ( cs->szMsg != NULL ) free(cs->szMsg); @@ -1107,7 +1107,7 @@ INT_PTR AnnounceStatusChangeService(WPARAM wParam, LPARAM lParam) for ( int i=0; i < connectionSettings.getCount(); i++ ) { TConnectionSettings& cs = connectionSettings[i]; - if ( !lstrcmpA( cs.szName, newSituation->szName )) + if ( !mir_strcmp( cs.szName, newSituation->szName )) AssignStatus(&cs, newSituation->status, newSituation->lastStatus, newSituation->szMsg); } @@ -1174,7 +1174,7 @@ int OnAccChanged(WPARAM wParam, LPARAM lParam) case PRAC_REMOVED: for (int i = 0; i < connectionSettings.getCount(); i++) { - if (!lstrcmpA(connectionSettings[i].szName, pa->szModuleName)) { + if (!mir_strcmp(connectionSettings[i].szName, pa->szModuleName)) { connectionSettings.remove(i); break; } diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp index f00a0a49dc..9065e97b43 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp +++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp @@ -23,7 +23,7 @@ static UINT_PTR setStatusTimerId = 0; int CompareSettings(const TSSSetting *p1, const TSSSetting *p2)
{
- return lstrcmpA(p1->szName, p2->szName);
+ return mir_strcmp(p1->szName, p2->szName);
}
static TSettingsList startupSettings(10, CompareSettings);
@@ -191,7 +191,7 @@ int OnAccChanged(WPARAM wParam, LPARAM lParam) case PRAC_REMOVED:
for (int i = 0; i < startupSettings.getCount(); i++) {
- if (!lstrcmpA(startupSettings[i].szName, pa->szModuleName)) {
+ if (!mir_strcmp(startupSettings[i].szName, pa->szModuleName)) {
startupSettings.remove(i);
break;
}
diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp index 04305df0b1..9813826bde 100644 --- a/plugins/StatusPlugins/confirmdialog.cpp +++ b/plugins/StatusPlugins/confirmdialog.cpp @@ -43,7 +43,7 @@ struct TConfirmSetting : public PROTOCOLSETTINGEX };
static int CompareSettings( const TConfirmSetting* p1, const TConfirmSetting* p2 )
-{ return lstrcmpA( p1->szName, p2->szName );
+{ return mir_strcmp( p1->szName, p2->szName );
}
static OBJLIST<TConfirmSetting> *confirmSettings;
|