From 2e4abd268c71f15bcf73c49a5005f128ffd8ee96 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 May 2013 15:08:49 +0000 Subject: shortened typedefs for string buffers: MCBuf -> mir_ptr MTBuf -> mir_ptr MWBuf -> mir_ptr git-svn-id: http://svn.miranda-ng.org/main/trunk@4680 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/proto.cpp | 10 +++++----- protocols/FacebookRM/src/utils.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/FacebookRM') diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 59c4261bc9..757ef80093 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -459,7 +459,7 @@ int FacebookProto::VisitProfile(WPARAM wParam,LPARAM lParam) std::string url = FACEBOOK_URL_PROFILE; - mir_ptr val = db_get_sa(hContact, m_szModuleName, "Homepage"); + MCBuf val = db_get_sa(hContact, m_szModuleName, "Homepage"); if (val != NULL) { // Homepage link already present, get it url = val; @@ -481,7 +481,7 @@ int FacebookProto::VisitFriendship(WPARAM wParam,LPARAM lParam) if (wParam == 0 || !IsMyContact(hContact)) return 1; - mir_ptr id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID); + MCBuf id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID); std::string url = FACEBOOK_URL_PROFILE; url += facy.self_.user_id; @@ -520,14 +520,14 @@ int FacebookProto::CancelFriendship(WPARAM wParam,LPARAM lParam) || (deleting && db_get_b(hContact, m_szModuleName, FACEBOOK_KEY_CONTACT_TYPE, 0) != FACEBOOK_CONTACT_FRIEND)) return 0; - mir_ptr tname = db_get_tsa(hContact, m_szModuleName, FACEBOOK_KEY_NAME); + MTBuf tname = db_get_tsa(hContact, m_szModuleName, FACEBOOK_KEY_NAME); if (tname == NULL) tname = db_get_tsa(hContact, m_szModuleName, FACEBOOK_KEY_ID); TCHAR tstr[256]; if (MessageBox(0, tstr, m_tszUserName, MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2) == IDYES) { - mir_ptr id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID); + MCBuf id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID); if (id == NULL) return 1; @@ -552,7 +552,7 @@ int FacebookProto::RequestFriendship(WPARAM wParam,LPARAM lParam) HANDLE hContact = reinterpret_cast(wParam); - mir_ptr id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID); + MCBuf id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID); if (id == NULL) return 1; diff --git a/protocols/FacebookRM/src/utils.cpp b/protocols/FacebookRM/src/utils.cpp index 46c56cafd1..f3b5c62640 100644 --- a/protocols/FacebookRM/src/utils.cpp +++ b/protocols/FacebookRM/src/utils.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . std::string utils::url::encode(const std::string &s) { - return (char*)mir_ptr(mir_urlEncode(s.c_str())); + return (char*)MCBuf(mir_urlEncode(s.c_str())); } std::string utils::url::decode(std::string data) -- cgit v1.2.3