From ac6607c5f76566c2c840ca3955a22448738df9b3 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 28 Jan 2019 15:51:04 +0300
Subject: mir_urlDecode & mir_urlEncode to return CMStringA

---
 src/mir_app/src/MHttpRequest.cpp | 4 ++--
 src/mir_app/src/stdafx.h         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/MHttpRequest.cpp b/src/mir_app/src/MHttpRequest.cpp
index 0ffd73f894..832b087bc5 100644
--- a/src/mir_app/src/MHttpRequest.cpp
+++ b/src/mir_app/src/MHttpRequest.cpp
@@ -78,7 +78,7 @@ MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const CHAR_PARAM &para
 	CMStringA &s = pReq->m_szParam;
 	if (!s.IsEmpty())
 		s.AppendChar('&');
-	s.AppendFormat("%s=%s", param.szName, ptrA(mir_urlEncode(param.szValue)));
+	s.AppendFormat("%s=%s", param.szName, mir_urlEncode(param.szValue).c_str());
 	return pReq;
 }
 
@@ -88,6 +88,6 @@ MIR_APP_DLL(MHttpRequest*) operator<<(MHttpRequest *pReq, const WCHAR_PARAM &par
 	CMStringA &s = pReq->m_szParam;
 	if (!s.IsEmpty())
 		s.AppendChar('&');
-	s.AppendFormat("%s=%s", param.szName, ptrA(mir_urlEncode(szValue)));
+	s.AppendFormat("%s=%s", param.szName, mir_urlEncode(szValue).c_str());
 	return pReq;
 }
diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h
index f9c6d70b84..17179644b5 100644
--- a/src/mir_app/src/stdafx.h
+++ b/src/mir_app/src/stdafx.h
@@ -61,7 +61,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 
 #include <m_system.h>
-#include <m_string.h>
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_db_int.h>
-- 
cgit v1.2.3