Index: src/ch/ShortcutsDlg.cpp
===================================================================
diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -r973e284577383310bef3c4e4ef21de0b14e44094
--- src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/ShortcutsDlg.cpp	(.../ShortcutsDlg.cpp)	(revision 973e284577383310bef3c4e4ef21de0b14e44094)
@@ -236,7 +236,7 @@
 	m_ctlPath.GetWindowText(sc.m_strPath);
 
 	// add to an array
-	m_cvShortcuts.push_back((CString)sc);
+	m_cvShortcuts.push_back(sc.ToString());
 
 	// add with an icon
 	SHFILEINFO sfi;
@@ -262,7 +262,7 @@
 		m_ctlPath.GetWindowText(sc.m_strPath);
 
 		// array update
-		m_cvShortcuts[iPos] = (CString)sc;
+		m_cvShortcuts[iPos] = sc.ToString();
 
 		// list
 		SHFILEINFO sfi;
@@ -314,7 +314,7 @@
 		// swap data in m_ascShortcuts
 		std::vector<CString>::iterator iterOne = m_cvShortcuts.begin() + iPos - 1;
 		std::vector<CString>::iterator iterTwo = m_cvShortcuts.begin()+iPos;
-		std::swap(iterOne, iterTwo);
+		std::iter_swap(iterOne, iterTwo);
 		//m_cvShortcuts.swap();
 
 		// do the same with list
@@ -353,7 +353,7 @@
 		std::vector<CString>::iterator iterOne = m_cvShortcuts.begin() + iPos;
 		std::vector<CString>::iterator iterTwo = m_cvShortcuts.begin() + iPos + 1;
 
-		std::swap(iterOne, iterTwo);
+		std::iter_swap(iterOne, iterTwo);
 
 		// do the same with list
 		SHFILEINFO sfi;