diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Import/src/import.cpp | 4 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/CContactList.cpp | 4 | ||||
| -rw-r--r-- | plugins/RecentContacts/src/RecentContacts.cpp | 2 | ||||
| -rw-r--r-- | plugins/RemovePersonalSettings/src/rps.cpp | 2 | ||||
| -rw-r--r-- | plugins/SimpleStatusMsg/res/resource.rc | 2 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_str.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 519821b3be..ce9108f78a 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -42,7 +42,7 @@ struct AccountMap };
static int CompareAccs(const AccountMap *p1, const AccountMap *p2)
-{ return stricmp(p1->szSrcAcc, p2->szSrcAcc);
+{ return mir_strcmpi(p1->szSrcAcc, p2->szSrcAcc);
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -1013,7 +1013,7 @@ static void ImportHistory(MCONTACT hContact, PROTOACCOUNT **protocol, int protoC /////////////////////////////////////////////////////////////////////////////////////////
static int CompareModules(const char *p1, const char *p2)
-{ return stricmp(p1, p2);
+{ return mir_strcmpi(p1, p2);
}
void MirandaImport(HWND hdlg)
diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index 965607226c..f8c73e78bd 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -132,7 +132,7 @@ void CContactList::AddContact(MCONTACT hContact) }
// Don't add metacontacts as contacts
- if(!stricmp(szProto,"MetaContacts"))
+ if(!mir_strcmpi(szProto,"MetaContacts"))
{
if(!CConfig::GetBoolSetting(CLIST_USEGROUPS))
strGroup = _T("");
@@ -1010,7 +1010,7 @@ void CContactList::InitializeGroupObjects() {
tstring strGroup = GetContactGroupPath(hContact);
szProto = GetContactProto(hContact);
- if(szProto && db_get_b(NULL,"MetaContacts","Enabled",1) && !stricmp(szProto,"MetaContacts"))
+ if(szProto && db_get_b(NULL,"MetaContacts","Enabled",1) && !mir_strcmpi(szProto,"MetaContacts"))
{
tstring strName = CAppletManager::GetContactDisplayname(hContact);
tstring strPath = _T("");
diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 4c0aab827c..5acf5b7309 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -455,7 +455,7 @@ static int OnContactSettingChanged( WPARAM hContact, LPARAM lParam ) {
DBCONTACTWRITESETTING* pdbcws = ( DBCONTACTWRITESETTING* )lParam;
if ( hContact == NULL )
- if ( !stricmp( pdbcws->szModule, dbLastUC_ModuleName))
+ if ( !mir_strcmpi( pdbcws->szModule, dbLastUC_ModuleName))
LoadDBSettings();
return 0;
diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index aa654a90c3..2c42967039 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -526,7 +526,7 @@ BOOL GetSettingBool(const char *section, const char *key, BOOL defaultValue) if (GetPrivateProfileStringA(section, key, defaultValue ? "true" : "false", tmp, sizeof(tmp), gIniFile) == 0)
return defaultValue;
- return stricmp(tmp, "true") == 0;
+ return mir_strcmpi(tmp, "true") == 0;
}
diff --git a/plugins/SimpleStatusMsg/res/resource.rc b/plugins/SimpleStatusMsg/res/resource.rc index 784edb72ac..87633b4fe3 100644 --- a/plugins/SimpleStatusMsg/res/resource.rc +++ b/plugins/SimpleStatusMsg/res/resource.rc @@ -314,7 +314,7 @@ BEGIN MENUITEM "?txtfile(file,line)", ID__VARIABLES_TXTFILEFILELINE
MENUITEM "?if(condition,true,false)", ID__VARIABLES_IFCONDITIONTRUEFALSE
MENUITEM "?mir_strcmp(string1,string2)", ID__VARIABLES_STRCMPSTRING1STRING2
- MENUITEM "?stricmp(string1,string2)", ID__VARIABLES_STRICMPSTRING1STRING2
+ MENUITEM "?mir_strcmpi(string1,string2)", ID__VARIABLES_STRICMPSTRING1STRING2
MENUITEM "?cdate(format)", ID__VARIABLES_CDATEFORMAT
MENUITEM "?ctime(format)", ID__VARIABLES_CTIMEFORMAT
MENUITEM "?replace(sub,string1,string2)", ID__VARIABLES_REPLACESUBSTRING1STRING2
diff --git a/plugins/Variables/src/parse_str.h b/plugins/Variables/src/parse_str.h index 05f14d81c2..b0b4e88882 100644 --- a/plugins/Variables/src/parse_str.h +++ b/plugins/Variables/src/parse_str.h @@ -46,7 +46,7 @@ #define MIR_STRCMP _T("mir_strcmp")
#define MIR_STRNCMP _T("strncmp")
#define MIR_STRMCMP _T("strmcmp")
-#define MIR_STRICMP _T("stricmp")
+#define MIR_STRICMP _T("mir_strcmpi")
#define MIR_STRNICMP _T("strnicmp")
#define MIR_SUBSTR _T("substr")
#define MIR_SELECT _T("select")
|