From 5f03619d3bbda7a617f50ded2698cffc434dd525 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 28 Mar 2013 10:35:19 +0000
Subject: warning fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@4224 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/UserInfoEx/src/dlg_anniversarylist.cpp           | 14 ++++----------
 plugins/UserInfoEx/src/dlg_propsheet.cpp                 |  2 +-
 plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp |  2 +-
 plugins/UserInfoEx/src/mir_db.cpp                        |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'plugins/UserInfoEx/src')

diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index ba8414a843..6c031103a8 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -855,21 +855,15 @@ class CAnnivList
 						numBirthContacts++;
 
 						// add birthday
-						if ((_filter.bFilterIndex != FILTER_ANNIV) && (!_filter.pszProto || !strcmpi(pszProto, _filter.pszProto))) {
+						if ((_filter.bFilterIndex != FILTER_ANNIV) && (!_filter.pszProto || !_strcmpi(pszProto, _filter.pszProto)))
 							AddRow(hContact, pszProto, ad, mtNow, wDaysBefore);
-						}
 					}
 
 					// 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.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()))
 								AddRow(hContact, pszProto, ad, mtNow, wDaysBefore);
-							}
-						}
-					}
 				}
 			}
 		}
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 60ffb52cbb..bfb3212a0b 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -550,7 +550,7 @@ static INT InitDetails(WPARAM wParam, LPARAM lParam)
 			if (lParam) {
 
 				// ignore common pages for weather contacts
-				if (!pPsh->_pszProto || stricmp(pPsh->_pszProto, "weather")) 
+				if (!pPsh->_pszProto || _stricmp(pPsh->_pszProto, "weather")) 
 				{
 					AddProtocolPages(odp, wParam);
 					odp.ptszTitle = LPGENT("About") _T("\\") LPGENT("Notes");
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 5b3fea4967..1f726d3181 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -1071,7 +1071,7 @@ INT CExImContactXML::ImportEvent(LPCSTR pszModule, TiXmlElement *xmlEvent)
 	if (!xmlEvent || !pszModule || !*pszModule)
 		return ERROR_INVALID_PARAMS;
 
-	if (stricmp(xmlEvent->Value(), "evt"))
+	if (_stricmp(xmlEvent->Value(), "evt"))
 		return ERROR_NOT_ADDED;
 
 	// timestamp must be valid
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index c95bb40eb3..c5cbd35343 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -1151,7 +1151,7 @@ BOOLEAN	IsEqual(const DBEVENTINFO *d1, const DBEVENTINFO *d2, bool Data)
 				(d1->timestamp == d2->timestamp) && 
 				(d1->eventType == d2->eventType) &&
 				(d1->cbBlob == d2->cbBlob) && 
-				(!d1->szModule || !d2->szModule || !stricmp(d1->szModule, d2->szModule))
+				(!d1->szModule || !d2->szModule || !_stricmp(d1->szModule, d2->szModule))
 				;
 	if(Data) {
 			return res &&
-- 
cgit v1.2.3