From 9fb4afe66dca4f6b3a73c442a8bbcf5e84674b00 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 26 Aug 2015 18:59:00 +0000
Subject: warning fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@15038 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Boltun/src/Engine/Mind.cpp   | 11 ++---------
 plugins/Clist_nicer/src/clcutils.cpp | 12 ++++++------
 plugins/FTPFileYM/src/serverlist.cpp |  2 --
 plugins/Popup/Popup.vcxproj          |  1 +
 4 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Boltun/src/Engine/Mind.cpp b/plugins/Boltun/src/Engine/Mind.cpp
index 11e636cd81..0acecb52a9 100644
--- a/plugins/Boltun/src/Engine/Mind.cpp
+++ b/plugins/Boltun/src/Engine/Mind.cpp
@@ -245,17 +245,10 @@ void Mind::Load(tstring filename)
 					toLowerStr(c);
 					{
 						std::transform(s1.begin(), s1.end(), s1.begin(), ::tolower);
-						int count1 = (int)s1.length();
-						TCHAR *c = new TCHAR[count1 + 1];
-						mir_tstrcpy(c, s1.c_str());
-						CharLower(c);
-						s1 = c;
-						delete c;
 						vector<tstring> strs = Parse(s1);
-						tstring sc(c);
-						data->raliases.insert(make_pair(sc, strs));
+						data->raliases.insert(make_pair(s1, strs));
 						for (vector<tstring>::const_iterator it = strs.begin(); it != strs.end(); ++it)
-							data->aliases.insert(make_pair(*it, sc));
+							data->aliases.insert(make_pair(*it, s1));
 					}
 					break;
 
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp
index da568c67a6..29d50c489d 100644
--- a/plugins/Clist_nicer/src/clcutils.cpp
+++ b/plugins/Clist_nicer/src/clcutils.cpp
@@ -474,16 +474,16 @@ void SetGroupExpand(HWND hwnd, struct ClcData *dat, ClcGroup *group, int newStat
 	SendMessage(GetParent(hwnd), WM_NOTIFY, 0, (LPARAM)&nm);
 }
 
-static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	switch (msg) {
+	switch (uMsg) {
 	case WM_KEYDOWN:
 		switch (wParam) {
 		case VK_RETURN:
-			pcli->pfnEndRename(GetParent(hwnd), (struct ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);
+			pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1);
 			return 0;
 		case VK_ESCAPE:
-			pcli->pfnEndRename(GetParent(hwnd), (struct ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 0);
+			pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 0);
 			return 0;
 		}
 		break;
@@ -497,10 +497,10 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPara
 		}
 		return DLGC_WANTMESSAGE;
 	case WM_KILLFOCUS:
-		pcli->pfnEndRename(GetParent(hwnd), (struct ClcData *) GetWindowLongPtr(GetParent(hwnd), 0), 1);
+		pcli->pfnEndRename(GetParent(hwnd), (ClcData*)GetWindowLongPtr(GetParent(hwnd), 0), 1);
 		return 0;
 	}
-	return mir_callNextSubclass(hwnd, RenameEditSubclassProc, msg, wParam, lParam);
+	return mir_callNextSubclass(hwnd, RenameEditSubclassProc, uMsg, wParam, lParam);
 }
 
 void BeginRenameSelection(HWND hwnd, struct ClcData *dat)
diff --git a/plugins/FTPFileYM/src/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp
index 878bbd87a6..7610369e11 100644
--- a/plugins/FTPFileYM/src/serverlist.cpp
+++ b/plugins/FTPFileYM/src/serverlist.cpp
@@ -72,8 +72,6 @@ ServerList::FTP::FTP(int index)
 	DB::getAStringF(0, MODULE, "Url%d", index, m_szUrl);
 	DB::getAStringF(0, MODULE, "Dir%d", index, m_szDir);
 	DB::getAStringF(0, MODULE, "Chmod%d", index, m_szChmod);
-	if (m_szUrl[0] == 0)
-		strcpy(m_szUrl, "/");
 	m_ftpProto = (FTP::EProtoType)DB::getWordF(0, MODULE, "FtpProto%d", index, FTP::FT_STANDARD);
 	m_iPort = DB::getWordF(0, MODULE, "Port%d", index, 21);
 	m_bPassive = DB::getByteF(0, MODULE, "Passive%d", index, 0) ? true : false;
diff --git a/plugins/Popup/Popup.vcxproj b/plugins/Popup/Popup.vcxproj
index 4499109c4e..21ab78619e 100644
--- a/plugins/Popup/Popup.vcxproj
+++ b/plugins/Popup/Popup.vcxproj
@@ -27,6 +27,7 @@
   </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
+      <DisableSpecificWarnings>4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ExceptionHandling>Sync</ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
-- 
cgit v1.2.3