From 011137bd4d5ef75cfb832f82a0cb47b06124a022 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 May 2013 15:19:22 +0000 Subject: words of wisdom were well received now the shortened types are called ptrA, ptrT & ptrW respectively git-svn-id: http://svn.miranda-ng.org/main/trunk@4682 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/src/im.cpp | 2 +- protocols/Yahoo/src/proto.cpp | 10 +++++----- protocols/Yahoo/src/yahoo.cpp | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'protocols/Yahoo/src') diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp index 30220bdffd..928595c61c 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; } - MCBuf msg; + ptrA 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 f56efaba62..1270da32e2 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) { - MCBuf who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID)); + ptrA who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID)); if (who) { - MCBuf myid( db_get_sa(hContact, m_szModuleName, "MyIdentity")); + ptrA 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) { - MCBuf who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID)); + ptrA who( db_get_sa(hContact, m_szModuleName, YAHOO_LOGINID)); if (who) { - MCBuf myid( db_get_sa(hContact, m_szModuleName, "MyIdentity")); - MCBuf u_reason( mir_utf8encodeT(reason)); + ptrA myid( db_get_sa(hContact, m_szModuleName, "MyIdentity")); + ptrA 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 f3b8d6a438..e0bd6f5e34 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)); - MTBuf tszMsg(mir_utf8decodeT(msg)); + ptrT 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")); - MTBuf tszWho( mir_utf8decodeT(who)); - MTBuf tszMsg( mir_utf8decodeT(msg)); + ptrT tszWho( mir_utf8decodeT(who)); + ptrT 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); - MTBuf tszFrom( mir_utf8decodeT(from)); - MTBuf tszSubj( mir_utf8decodeT(subj)); + ptrT tszFrom( mir_utf8decodeT(from)); + ptrT 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)); - MTBuf tszWho( mir_utf8decodeT(who)); - MTBuf tszMsg( mir_utf8decodeT(msg)); + ptrT tszWho( mir_utf8decodeT(who)); + ptrT 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)); - MTBuf tszMsg( mir_utf8decodeT(errormsg)); + ptrT 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) { - MTBuf tszErr( mir_utf8decodeT(err)); + ptrT tszErr( mir_utf8decodeT(err)); TCHAR buff[1024]; LOG(("[ext_error] Error: fatal: %d, num: %d, err: %s", fatal, num, err)); -- cgit v1.2.3