shortened typedefs for string buffers:

  MCBuf -> mir_ptr<char>
  MTBuf -> mir_ptr<TCHAR>
  MWBuf -> mir_ptr<WCHAR>

git-svn-id: http://svn.miranda-ng.org/main/trunk@4680 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 15 insertions, 15 deletions

diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp
index a0c44aa7d3..30220bdffd 100644
--- a/protocols/Yahoo/src/im.cpp
+++ b/protocols/Yahoo/src/im.cpp
@@ -180,7 +180,7 @@ int __cdecl CYahooProto::SendMsg( HANDLE hContact, int flags, const char* pszSrc
 		return 1;

 	}

 

-	mir_ptr<char> msg;

+	MCBuf msg;

 	if (flags & PREF_UNICODE) /* convert to utf8 */

 		msg = mir_utf8encodeW(( wchar_t* )&pszSrc[ strlen(pszSrc)+1 ] );

 	else if ( flags & PREF_UTF )

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index da3c4751d0..f56efaba62 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -209,9 +209,9 @@ int CYahooProto::Authorize( HANDLE hdbe )
 	/* Need to remove the buddy from our Miranda Lists */

 	HANDLE hContact = DbGetAuthEventContact(&dbei);

 	if (hContact != NULL) {

-		mir_ptr<char> who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID));

+		MCBuf who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID));

 		if (who) {

-			mir_ptr<char> myid( db_get_sa(hContact, m_szModuleName, "MyIdentity"));

+			MCBuf myid( db_get_sa(hContact, m_szModuleName, "MyIdentity"));

 			DebugLog("Accepting buddy:%s", who);

 			accept(myid, who, GetWord(hContact, "yprotoid", 0));

 		}

@@ -254,10 +254,10 @@ int CYahooProto::AuthDeny( HANDLE hdbe, const TCHAR* reason )
 	/* Need to remove the buddy from our Miranda Lists */

 	HANDLE hContact = DbGetAuthEventContact(&dbei);

 	if (hContact != NULL) {

-		mir_ptr<char> who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID));

+		MCBuf who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID));

 		if (who) {

-			mir_ptr<char> myid( db_get_sa(hContact, m_szModuleName, "MyIdentity"));

-			mir_ptr<char> u_reason( mir_utf8encodeT(reason));

+			MCBuf myid( db_get_sa(hContact, m_szModuleName, "MyIdentity"));

+			MCBuf u_reason( mir_utf8encodeT(reason));

 

 			DebugLog("Rejecting buddy:%s msg: %s", who, u_reason);

 			reject(myid, who, GetWord(hContact, "yprotoid", 0), u_reason);

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index cfbff5ebfd..f3b8d6a438 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -586,7 +586,7 @@ void CYahooProto::ext_got_calendar(const char *url, int type, const char *msg, i
 {

 	LOG(("[ext_got_calendar] URL:%s type: %d msg: %s svc: %d", url, type, msg, svc));

 	

-	mir_ptr<TCHAR> tszMsg(mir_utf8decodeT(msg));

+	MTBuf tszMsg(mir_utf8decodeT(msg));

 	if (!ShowPopup( TranslateT("Calendar Reminder"), tszMsg, url))

 		ShowNotification(TranslateT("Calendar Reminder"), tszMsg, NIIF_INFO);

 }

@@ -731,8 +731,8 @@ void CYahooProto::ext_rejected(const char *who, const char *msg)
 	}

 	else LOG(("[ext_rejected] Buddy not on our buddy list"));

 

-	mir_ptr<TCHAR> tszWho( mir_utf8decodeT(who));

-	mir_ptr<TCHAR> tszMsg( mir_utf8decodeT(msg));

+	MTBuf tszWho( mir_utf8decodeT(who));

+	MTBuf tszMsg( mir_utf8decodeT(msg));

 

 	TCHAR buff[1024];

 	mir_sntprintf(buff, SIZEOF(buff), TranslateT("%s has rejected your request and sent the following message:"), (TCHAR*)tszWho);

@@ -991,8 +991,8 @@ void CYahooProto::ext_mail_notify(const char *from, const char *subj, int cnt)
 			else {

 				mir_sntprintf(title, SIZEOF(title), TranslateT("New Mail (%i msgs)"), cnt);

 

-				mir_ptr<TCHAR> tszFrom( mir_utf8decodeT(from));

-				mir_ptr<TCHAR> tszSubj( mir_utf8decodeT(subj));

+				MTBuf tszFrom( mir_utf8decodeT(from));

+				MTBuf tszSubj( mir_utf8decodeT(subj));

 				mir_sntprintf(z, SIZEOF(z), TranslateT("From: %s\nSubject: %s"), (TCHAR*)tszFrom, (TCHAR*)tszSubj);

 			}

 	

@@ -1009,8 +1009,8 @@ void CYahooProto::ext_system_message(const char *me, const char *who, const char
 {

 	LOG(("[ext_system_message] System Message to: %s from: %s msg: %s", me, who, msg));

 

-	mir_ptr<TCHAR> tszWho( mir_utf8decodeT(who));

-	mir_ptr<TCHAR> tszMsg( mir_utf8decodeT(msg));

+	MTBuf tszWho( mir_utf8decodeT(who));

+	MTBuf tszMsg( mir_utf8decodeT(msg));

 	ShowPopup((who != NULL) ? tszWho : TranslateT("Yahoo System Message"), tszMsg, NULL);

 }

 

@@ -1069,7 +1069,7 @@ void CYahooProto::ext_got_ping(const char *errormsg)
 

 	if (errormsg) {

 		LOG(("[ext_got_ping] Error msg: %s", errormsg));

-		mir_ptr<TCHAR> tszMsg( mir_utf8decodeT(errormsg));

+		MTBuf tszMsg( mir_utf8decodeT(errormsg));

 		ShowError( TranslateT("Yahoo Ping Error"), tszMsg);

 		return;

 	}

@@ -1168,7 +1168,7 @@ void CYahooProto::ext_login_response(int succ, const char *url)
 

 void CYahooProto::ext_error(const char *err, int fatal, int num)

 {

-	mir_ptr<TCHAR> tszErr( mir_utf8decodeT(err));

+	MTBuf tszErr( mir_utf8decodeT(err));

 	TCHAR buff[1024];

 	

 	LOG(("[ext_error] Error: fatal: %d, num: %d, err: %s", fatal, num, err));