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

4 files changed, 11 insertions, 11 deletions

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index f10302491f..2cf3f4cdf7 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -618,7 +618,7 @@ bool facebook_client::login(const std::string &username,const std::string &passw
 	data += "&email=" + utils::url::encode(username);

 	data += "&pass=" + utils::url::encode(password);

 

-	MCBuf locale( db_get_sa(NULL, parent->m_szModuleName, FACEBOOK_KEY_LOCALE));

+	ptrA locale( db_get_sa(NULL, parent->m_szModuleName, FACEBOOK_KEY_LOCALE));

 	if (locale != NULL)

 		data += "&locale=" + std::string(locale);

 

@@ -723,7 +723,7 @@ bool facebook_client::login(const std::string &username,const std::string &passw
 

 		TCHAR buf[200];

 		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Login error: %s"), 

-			(!error_str.length()) ? TranslateT("Unknown error") : MTBuf(mir_utf8decodeT(error_str.c_str())));

+			(!error_str.length()) ? TranslateT("Unknown error") : ptrT(mir_utf8decodeT(error_str.c_str())));

 		client_notify(buf);

 	}

 	case HTTP_CODE_FORBIDDEN: // Forbidden

diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp
index 14c6c3313d..02c130756f 100644
--- a/protocols/FacebookRM/src/messages.cpp
+++ b/protocols/FacebookRM/src/messages.cpp
@@ -174,7 +174,7 @@ void FacebookProto::ReadMessageWorker(void *p)
 

 	if (!db_get_b(NULL, m_szModuleName, FACEBOOK_KEY_MARK_READ, 0)) {

 		// old variant - no seen info updated

-		MCBuf id( db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID));

+		ptrA id( db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID));

 		if (id == NULL) return;

 

 		std::string data = "action=chatMarkRead";

@@ -185,7 +185,7 @@ void FacebookProto::ReadMessageWorker(void *p)
 		http::response resp = facy.flap(FACEBOOK_REQUEST_ASYNC, &data);

 	} else {

 		// new variant - with seen info 

-		MCBuf mid( db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_MESSAGE_ID));

+		ptrA mid( db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_MESSAGE_ID));

 		if (mid == NULL) return;

 

 		std::string data = "ids[" + std::string(mid) + "]=true";

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index c20752f50b..c6c0f4401b 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;

 

-	MCBuf val = db_get_sa(hContact, m_szModuleName, "Homepage");

+	ptrA 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;

 

-	MCBuf id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID);

+	ptrA id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID);

 

 	std::string url = FACEBOOK_URL_PROFILE;

 	url += facy.self_.user_id;

@@ -498,7 +498,7 @@ int FacebookProto::Poke(WPARAM wParam,LPARAM lParam)
 

 	HANDLE hContact = reinterpret_cast<HANDLE>(wParam);

 

-	MCBuf id( db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID));

+	ptrA id( db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID));

 	if (id == NULL)

 		return 1;

 	

@@ -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;

 

-	MTBuf tname = db_get_tsa(hContact, m_szModuleName, FACEBOOK_KEY_NAME);

+	ptrT 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) {

 

-		MCBuf id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID);

+		ptrA 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<HANDLE>(wParam);

 

-	MCBuf id = db_get_sa(hContact, m_szModuleName, FACEBOOK_KEY_ID);

+	ptrA 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 f3b5c62640..10214d970c 100644
--- a/protocols/FacebookRM/src/utils.cpp
+++ b/protocols/FacebookRM/src/utils.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 std::string utils::url::encode(const std::string &s)

 {

-	return (char*)MCBuf(mir_urlEncode(s.c_str()));

+	return (char*)ptrA(mir_urlEncode(s.c_str()));

 }

 

 std::string utils::url::decode(std::string data)