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

39 files changed, 83 insertions, 83 deletions

diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp
index 561f5801be..46c84d363d 100644
--- a/plugins/AvatarHistory/src/AvatarDlg.cpp
+++ b/plugins/AvatarHistory/src/AvatarDlg.cpp
@@ -450,7 +450,7 @@ int FillAvatarListFromDB(HWND list, HANDLE hContact)
 

 		// Get file in disk

 		TCHAR path[MAX_PATH];

-		MTBuf tszStoredPath(mir_utf8decodeT((char*)dbei.pBlob));

+		ptrT tszStoredPath(mir_utf8decodeT((char*)dbei.pBlob));

 		PathToAbsoluteT(tszStoredPath, path);

 

 		// Add to list

diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp
index a11448d4c4..721c3a89f5 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.cpp
+++ b/plugins/AvatarHistory/src/AvatarHistory.cpp
@@ -218,7 +218,7 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam)
 		if (ContactEnabled(hContact, "LogToHistory", AVH_DEF_LOGTOHISTORY)) {

 			TCHAR rel_path[MAX_PATH];

 			PathToRelativeT(history_filename, rel_path);

-			MCBuf blob( mir_utf8encodeT(rel_path));

+			ptrA blob( mir_utf8encodeT(rel_path));

 

 			DBEVENTINFO dbei = { sizeof(dbei) };

 			dbei.szModule = GetContactProto(hContact);

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index f892ae1ef1..eb48801848 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -70,7 +70,7 @@ int MsgAck(WPARAM wParam, LPARAM lParam)
 			DBVARIANT dbv;

 			int reuse = db_get_b(ack->hContact,modname, "Reuse", 0);

 			if ( !db_get_ts(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

-				MCBuf pszUtf( mir_utf8encodeT(dbv.ptszVal));

+				ptrA pszUtf( mir_utf8encodeT(dbv.ptszVal));

 				dbei.cbSize = sizeof(dbei);

 				dbei.eventType = EVENTTYPE_MESSAGE;

 				dbei.flags = DBEF_UTF | DBEF_SENT;

diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index d2077ff74b..4e3f81af69 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -412,7 +412,7 @@ HTREEITEM FillAvailableSkinList(HWND hwndDlg)
 		SearchSkinFiles(hwndDlg, SkinsFolder);

 	{

 		TCHAR skinfull[MAX_PATH];

-		MTBuf skinfile( db_get_tsa( NULL, SKIN, "SkinFile"));

+		ptrT skinfile( db_get_tsa( NULL, SKIN, "SkinFile"));

 		if (skinfile) {

 			PathToAbsoluteT(skinfile, skinfull);

 			res = AddSkinToListFullName(hwndDlg, skinfull);

@@ -518,7 +518,7 @@ HTREEITEM AddItemToTree(HWND hTree, TCHAR *folder, TCHAR *itemName, void *data)
 

 INT_PTR SvcActiveSkin(WPARAM wParam, LPARAM lParam)

 {

-	MTBuf skinfile( db_get_tsa(NULL, SKIN, "SkinFile"));

+	ptrT skinfile( db_get_tsa(NULL, SKIN, "SkinFile"));

 	if (skinfile) {

 		TCHAR skinfull[MAX_PATH];

 		PathToAbsoluteT(skinfile, skinfull);

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 6f01f7408d..b9d9a5748c 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -453,7 +453,7 @@ void SaveState()
 		if (szTempModeName) {

 			SendDlgItemMessage(clvmHwnd, IDC_VIEWMODES, LB_GETTEXT, clvm_curItem, (LPARAM)szTempModeName);

 

-			MCBuf szModeName( mir_utf8encodeT(szTempModeName));

+			ptrA szModeName( mir_utf8encodeT(szTempModeName));

 

 			DWORD dwGlobalMask = GetMaskForItem(hInfoItem);

 			for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index b9c5f01355..0b965d5886 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -530,7 +530,7 @@ int LocateStorePosition(int Frameid, int maxstored)
 	for (int i = 0;i < maxstored;i++) {

 		char settingname[255];

 		mir_snprintf(settingname, sizeof(settingname), "Name%d", i);

-		MTBuf frmname( db_get_tsa(0, CLUIFrameModule, settingname));

+		ptrT frmname( db_get_tsa(0, CLUIFrameModule, settingname));

 		if (frmname == NULL) continue;

 		if (lstrcmpi(frmname, Frames[Frameid].name) == 0)

 			return i;

diff --git a/plugins/CrashDumper/src/upload.cpp b/plugins/CrashDumper/src/upload.cpp
index 8ce0252826..0097ff80be 100644
--- a/plugins/CrashDumper/src/upload.cpp
+++ b/plugins/CrashDumper/src/upload.cpp
@@ -75,7 +75,7 @@ void OpenAuthUrl(const char* url)
 	if (user[0] && pass[0]) {

 		char str[256];

 		mir_snprintf(str, sizeof(str), url, user);

-		mir_snprintf(str, sizeof(str), "http://www.miranda-vi.org/cdlogin?name=%s&pass=%s&redir=%s", user, pass, MCBuf( mir_urlEncode(str)));

+		mir_snprintf(str, sizeof(str), "http://www.miranda-vi.org/cdlogin?name=%s&pass=%s&redir=%s", user, pass, ptrA( mir_urlEncode(str)));

 		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)str);

 	}

 	else CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.miranda-vi.org/");

diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 8c57c2885c..6d17d5f99d 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -1095,7 +1095,7 @@ static int OnContactSettingChanged(WPARAM wParam, LPARAM lParam)
 	if (cws && cws->szSetting && !strcmp(cws->szSetting, "MirVer")) {

 		switch (cws->value.type) {

 		case DBVT_UTF8:

-			ApplyFingerprintImage(hContact, MTBuf(mir_utf8decodeT(cws->value.pszVal)));

+			ApplyFingerprintImage(hContact, ptrT(mir_utf8decodeT(cws->value.pszVal)));

 			break;

 		case DBVT_ASCIIZ:

 			ApplyFingerprintImage(hContact, _A2T(cws->value.pszVal));

@@ -1125,7 +1125,7 @@ static int OnSrmmWindowEvent(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	if (event->uType == MSG_WINDOW_EVT_OPEN) {

-		MTBuf ptszMirVer;

+		ptrT ptszMirVer;

 		char *szProto = GetContactProto(event->hContact);

 		if (szProto != NULL)

 			ptszMirVer = db_get_tsa(event->hContact, szProto, "MirVer");

diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp
index 90d3e72ac1..eb6ff7eaeb 100644
--- a/plugins/IEView/src/ChatHTMLBuilder.cpp
+++ b/plugins/IEView/src/ChatHTMLBuilder.cpp
@@ -87,7 +87,7 @@ char *ChatHTMLBuilder::timestampToString(time_t time)
 	char *pszStamp = "[%H:%M]";

 	//InitSetting( &g_Settings.pszTimeStamp, "HeaderTime", _T("[%H:%M]"));

 	strftime(str, 79, pszStamp, localtime(&time));

-	lstrcpynA(szResult, MCBuf(mir_utf8encode(str)), 500);

+	lstrcpynA(szResult, ptrA(mir_utf8encode(str)), 500);

 	return szResult;

 }

 

@@ -171,7 +171,7 @@ void ChatHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
 		const char *className = "";

 		bool showIcon = false;

 

-		MCBuf szName, szText;

+		ptrA szName, szText;

 		if (eventData->dwFlags & IEEDF_UNICODE_TEXT)

 			szText = encodeUTF8(NULL, event->pszProto, eventData->pszTextW, ENF_ALL | ENF_CHAT_FORMATTING, isSent);

 		else

diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp
index e284aafe02..6934a72764 100644
--- a/plugins/IEView/src/HTMLBuilder.cpp
+++ b/plugins/IEView/src/HTMLBuilder.cpp
@@ -312,7 +312,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event)
 	HANDLE hDbEvent = event->hDbEventFirst;

 	event->hDbEventFirst = NULL;

 

-	MCBuf szProto;

+	ptrA szProto;

 	if (event->cbSize >= IEVIEWEVENT_SIZE_V3 && event->pszProto != NULL)

 		szProto = mir_strdup(event->pszProto);

 	else

@@ -435,7 +435,7 @@ ProtocolSettings* HTMLBuilder::getSRMMProtocolSettings(const char *protocolName)
 

 ProtocolSettings* HTMLBuilder::getSRMMProtocolSettings(HANDLE hContact)

 {

-	return getSRMMProtocolSettings( MCBuf(getRealProto(hContact)));

+	return getSRMMProtocolSettings( ptrA(getRealProto(hContact)));

 }

 

 ProtocolSettings* HTMLBuilder::getHistoryProtocolSettings(const char *protocolName)

@@ -450,7 +450,7 @@ ProtocolSettings* HTMLBuilder::getHistoryProtocolSettings(const char *protocolNa
 ProtocolSettings* HTMLBuilder::getHistoryProtocolSettings(HANDLE hContact)

 {

 	if (hContact != NULL)

-		return getHistoryProtocolSettings( MCBuf(getRealProto(hContact)));

+		return getHistoryProtocolSettings( ptrA(getRealProto(hContact)));

 

 	return Options::getProtocolSettings();

 }

@@ -466,7 +466,7 @@ ProtocolSettings* HTMLBuilder::getChatProtocolSettings(const char *protocolName)
 

 ProtocolSettings* HTMLBuilder::getChatProtocolSettings(HANDLE hContact)

 {

-	return getChatProtocolSettings( MCBuf(getRealProto(hContact)));

+	return getChatProtocolSettings( ptrA(getRealProto(hContact)));

 }

 

 void HTMLBuilder::setLastIEViewEvent(IEVIEWEVENT *event)

diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp
index decd8bc6a9..5d454b7f54 100644
--- a/plugins/IEView/src/HistoryHTMLBuilder.cpp
+++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp
@@ -89,7 +89,7 @@ char *HistoryHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) {
 	dbtts.szFormat = (char *)"d t";

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

 	strncat(szResult, str, 500);

-	lstrcpynA(szResult, MCBuf(mir_utf8encode(szResult)), 500);

+	lstrcpynA(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

 

@@ -221,7 +221,7 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)

 {

 	DWORD dwFlags = db_get_b(NULL, HPPMOD, SRMSGSET_SHOWICONS, 0) ? SMF_LOG_SHOWICONS : 0;

-	MCBuf szRealProto( getRealProto(event->hContact));

+	ptrA szRealProto( getRealProto(event->hContact));

 	IEVIEWEVENTDATA* eventData = event->eventData;

 	for (int eventIdx = 0; eventData!=NULL && (eventIdx < event->count || event->count==-1); eventData = eventData->next, eventIdx++) {

 		int outputSize;

@@ -231,7 +231,7 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 		if (eventData->iType == IEED_EVENT_MESSAGE || eventData->iType == IEED_EVENT_STATUSCHANGE ||

 				eventData->iType == IEED_EVENT_URL || eventData->iType == IEED_EVENT_FILE)

 		{

-			MCBuf szName, szText;

+			ptrA szName, szText;

 			if (eventData->dwFlags & IEEDF_UNICODE_NICK)

 				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true);

 			else

diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp
index e7dcbb916c..e6feaa0761 100644
--- a/plugins/IEView/src/MUCCHTMLBuilder.cpp
+++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp
@@ -109,7 +109,7 @@ char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check)
 	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

 	strncat(szResult, str, 500);

-	lstrcpynA(szResult, MCBuf(mir_utf8encode(szResult)), 500);

+	lstrcpynA(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

 

@@ -190,7 +190,7 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 		bool isSent = eventData->bIsMe != 0;

 		int  outputSize;

 		char *output = NULL;

-		MCBuf szName, szText;

+		ptrA szName, szText;

 		if (eventData->iType == IEED_MUCC_EVENT_MESSAGE) {

 			if (eventData->dwFlags & IEEDF_UNICODE_TEXT)

 				szText = encodeUTF8(NULL, event->pszProto, eventData->pszTextW, ENF_ALL, isSent);

diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp
index c55a60f154..642b2083ad 100644
--- a/plugins/IEView/src/ScriverHTMLBuilder.cpp
+++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp
@@ -171,7 +171,7 @@ char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod
 		//_tcsncat(szResult, str, 500);

 		strncat(szResult, str, 500);

 	}

-	lstrcpynA(szResult, MCBuf(mir_utf8encode(szResult)), 500);

+	lstrcpynA(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

 

@@ -280,7 +280,7 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 	dwFlags |= db_get_b(NULL, SRMMMOD, SRMSGSET_MESSAGEONNEWLINE, 0) ? SMF_LOG_MSGONNEWLINE : 0;

 	dwFlags |= db_get_b(NULL, SRMMMOD, SRMSGSET_DRAWLINES, 0) ? SMF_LOG_DRAWLINES : 0;

 

-	MCBuf szRealProto( getRealProto(event->hContact));

+	ptrA szRealProto( getRealProto(event->hContact));

 	IEVIEWEVENTDATA* eventData = event->eventData;

 	for (int eventIdx = 0; eventData!=NULL && (eventIdx < event->count || event->count==-1); eventData = eventData->next, eventIdx++) {

 		const char *className = "";

@@ -300,7 +300,7 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 					(((eventData->time < startedTime) == (getLastEventTime() < startedTime)) || !(eventData->dwFlags & IEEDF_READ))) {

 				isGroupBreak = FALSE;

 			}

-			MCBuf szName, szText;

+			ptrA szName, szText;

 			if (eventData->dwFlags & IEEDF_UNICODE_NICK)

 				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true);

 			else

diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
index bb87bdac92..120024509c 100644
--- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
+++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
@@ -197,7 +197,7 @@ char *TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG
 	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

 	strncat(szResult, str, 500);

-	lstrcpynA(szResult, MCBuf(mir_utf8encode(szResult)), 500);

+	lstrcpynA(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

 

@@ -327,7 +327,7 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 				isGroupBreak = FALSE;

 			}

 

-			MCBuf szName, szText;

+			ptrA szName, szText;

 			if (eventData->dwFlags & IEEDF_UNICODE_NICK)

 				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true);

   			else

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index ecdf765f1d..042702089c 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -151,7 +151,7 @@ char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mo
 		}

 	}

 

-	lstrcpynA(szResult, MCBuf(mir_utf8encodeT(str)), 500);

+	lstrcpynA(szResult, ptrA(mir_utf8encodeT(str)), 500);

 	return szResult;

 }

 

@@ -297,7 +297,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 			}

 			if (tokenVal != NULL) {

 				if (token->getEscape())

-					Utils::appendText(&output, &outputSize, "%s", MCBuf(Utils::escapeString(tokenVal)));

+					Utils::appendText(&output, &outputSize, "%s", ptrA(Utils::escapeString(tokenVal)));

 				else

 					Utils::appendText(&output, &outputSize, "%s", tokenVal);

 			}

@@ -606,7 +606,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 					}

 					if (tokenVal != NULL) {

 						if (token->getEscape())

-							Utils::appendText(&output, &outputSize, "%s", MCBuf(Utils::escapeString(tokenVal)));

+							Utils::appendText(&output, &outputSize, "%s", ptrA(Utils::escapeString(tokenVal)));

 						else

 							Utils::appendText(&output, &outputSize, "%s", tokenVal);

 					}

diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index 84e01231a9..7730df32b6 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -84,7 +84,7 @@ static HANDLE HContactFromID(char* szProto, char* pszSetting, TCHAR* pwszID)
 	while (hContact != NULL) {

 		char* szProto = GetContactProto(hContact);

 		if ( !lstrcmpA(szProto, szProto)) {

-			MWBuf id( db_get_tsa(hContact, szProto, pszSetting));

+			ptrW id( db_get_tsa(hContact, szProto, pszSetting));

 			if ( !lstrcmp(pwszID, id))

 				return hContact;

 		}

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index a1cd406030..adcaf3f94b 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -452,11 +452,11 @@ static bool bWriteTextToFile(HANDLE hFile, const TCHAR *pszSrc, bool bUtf8File,
 

 	if ( !bUtf8File) {

 		// We need to downgrade text to ansi

-		MCBuf pszAstr( mir_t2a(pszSrc));

+		ptrA pszAstr( mir_t2a(pszSrc));

 		return bWriteToFile(hFile, pszAstr, -1);

 	}

 	

-	MCBuf pszUtf8( mir_utf8encodeT(pszSrc));

+	ptrA pszUtf8( mir_utf8encodeT(pszSrc));

 	return bWriteToFile(hFile, pszUtf8, -1);

 }

 

@@ -473,7 +473,7 @@ static bool bWriteTextToFile( HANDLE hFile, const char *pszSrc, bool bUtf8File,
 		pszSrc = tmp;

 	}

 

-	MCBuf pszUtf8( mir_utf8encode(pszSrc));

+	ptrA pszUtf8( mir_utf8encode(pszSrc));

 	return bWriteToFile(hFile, pszUtf8, -1);

 }

 

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index a952f56017..2f3ba4448b 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -241,11 +241,11 @@ void Protocol::GetStatusMsg(int aStatus, TCHAR *msg, size_t msg_size)
 	if ( !CanGetStatusMsg())

 		lcopystr(msg, _T(""), msg_size);

 	else if (aStatus == status && ProtoServiceExists(name, PS_GETMYAWAYMSG)) {

-		MTBuf tmp((TCHAR*)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR));

+		ptrT tmp((TCHAR*)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR));

 		lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size);

 	}

 	else if (ServiceExists(MS_AWAYMSG_GETSTATUSMSG)) {

-		MTBuf tmp((TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, 0));

+		ptrT tmp((TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, 0));

 		lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size);

 	}

 }

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index d93addd369..9d135f31ee 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -462,11 +462,11 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, HANDLE hContact)
 		if (_stricmp(smi.proto, "mRadio") == 0 && !cws->value.type == DBVT_DELETED) {

 			TCHAR buf[MAX_PATH];

 			mir_sntprintf(buf, SIZEOF(buf), _T(" (%s)"), TranslateT("connecting"));

-			MCBuf pszUtf( mir_utf8encodeT(buf));

+			ptrA pszUtf( mir_utf8encodeT(buf));

 			mir_sntprintf(buf, SIZEOF(buf), _T(" (%s)"), TranslateT("aborting"));

-			MCBuf pszUtf2( mir_utf8encodeT(buf));

+			ptrA pszUtf2( mir_utf8encodeT(buf));

 			mir_sntprintf(buf, SIZEOF(buf), _T(" (%s)"), TranslateT("playing"));

-			MCBuf pszUtf3( mir_utf8encodeT(buf));

+			ptrA pszUtf3( mir_utf8encodeT(buf));

 			if (_stricmp(cws->value.pszVal, pszUtf) == 0 || _stricmp(cws->value.pszVal, pszUtf2) == 0 || _stricmp(cws->value.pszVal, pszUtf3) == 0)

 				return 0;

 		}

diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index deac669fdd..36fdb3c339 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp
@@ -111,7 +111,7 @@ int BrowseForFolder(HWND hwnd,char *szPath)
 	if (SUCCEEDED(OleInitialize(NULL))) {

 		LPMALLOC pMalloc;

 		if (SUCCEEDED(CoGetMalloc(1,&pMalloc))) {

-			MTBuf tszPath( mir_a2t(szPath));

+			ptrT tszPath( mir_a2t(szPath));

 			BROWSEINFO bi={0};

 			bi.hwndOwner = hwnd;

 			bi.pszDisplayName = tszPath;

diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h
index 96627ee013..9a54f61846 100644
--- a/plugins/PluginUpdater/src/Common.h
+++ b/plugins/PluginUpdater/src/Common.h
@@ -189,10 +189,10 @@ public:
 	__inline operator INT_PTR() const { return (INT_PTR)data; }

 };

 

-struct VARST : public MTBuf

+struct VARST : public ptrT

 {

 	__forceinline VARST(const TCHAR *str) :

-		MTBuf( Utils_ReplaceVarsT(str))

+		ptrT( Utils_ReplaceVarsT(str))

 		{}

 };

 

diff --git a/plugins/PluginUpdater/src/Scanner.cpp b/plugins/PluginUpdater/src/Scanner.cpp
index d198419df7..3653adfd2f 100644
--- a/plugins/PluginUpdater/src/Scanner.cpp
+++ b/plugins/PluginUpdater/src/Scanner.cpp
@@ -289,7 +289,7 @@ static void CheckUpdates(void *)
 	REPLACEVARSDATA dat = { sizeof(REPLACEVARSDATA) };

 	dat.dwFlags = RVF_TCHAR;

 	dat.variables = vars;

-	MTBuf tszBaseUrl((TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)dbVar.ptszVal, (LPARAM)&dat));

+	ptrT tszBaseUrl((TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)dbVar.ptszVal, (LPARAM)&dat));

 	db_free(&dbVar);

 

 	// Download version info

diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp
index f157d7ebab..3582d69b31 100644
--- a/plugins/Popup/src/actions.cpp
+++ b/plugins/Popup/src/actions.cpp
@@ -261,7 +261,7 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				LVITEM item = {0};

 				item.mask = LVIF_IMAGE|LVIF_PARAM|LVIF_TEXT|LVIF_STATE|LVIF_INDENT;

 				item.iItem = i;

-				MTBuf tszName( mir_a2t(szName));

+				ptrT tszName( mir_a2t(szName));

 				item.pszText = TranslateTS(tszName);

 				item.iImage = ImageList_AddIcon(hImgList, gActions[i]->lchIcon);

 				item.lParam = i;

diff --git a/plugins/Quotes/src/QuotesProviderBase.cpp b/plugins/Quotes/src/QuotesProviderBase.cpp
index fbf62e66fe..fd261098da 100644
--- a/plugins/Quotes/src/QuotesProviderBase.cpp
+++ b/plugins/Quotes/src/QuotesProviderBase.cpp
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index b49ded9c7f..cf769776f9 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -355,7 +355,7 @@ static LRESULT CALLBACK LogEditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 		POINTL ptl = { (LONG)pt.x, (LONG)pt.y };

 		ScreenToClient(hwnd, (LPPOINT)&ptl);

-		MTBuf pszWord( GetRichTextWord(hwnd, &ptl));

+		ptrT pszWord( GetRichTextWord(hwnd, &ptl));

 		if ( pszWord && pszWord[0] ) {

 			TCHAR szMenuText[4096];

 			mir_sntprintf( szMenuText, 4096, TranslateT("Look up \'%s\':"), pszWord );

@@ -1109,8 +1109,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					wStatus = db_get_w( dat->windowData.hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);

 					// log status change - should be moved to a separate place

 					if (dat->wStatus != wStatus && db_get_b(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCH, SRMSGDEFSET_SHOWSTATUSCH)) {

-						MTBuf szOldStatus( mir_tstrdup((TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM) dat->wStatus, GSMDF_TCHAR)));

-						MTBuf szNewStatus( mir_tstrdup((TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM) wStatus, GSMDF_TCHAR)));

+						ptrT szOldStatus( mir_tstrdup((TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM) dat->wStatus, GSMDF_TCHAR)));

+						ptrT szNewStatus( mir_tstrdup((TCHAR *) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM) wStatus, GSMDF_TCHAR)));

 

 						int iLen;

 						TCHAR buffer[512];

diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp
index 7460d211b4..d6602f039f 100644
--- a/plugins/Scriver/src/utils.cpp
+++ b/plugins/Scriver/src/utils.cpp
@@ -431,8 +431,8 @@ void SearchWord(TCHAR * word, int engine)
 {

 	char szURL[4096];

 	if (word && word[0]) {

-		MCBuf wordUTF( mir_utf8encodeT(word));

-		MCBuf wordURL( mir_urlEncode(wordUTF));

+		ptrA wordUTF( mir_utf8encodeT(word));

+		ptrA wordURL( mir_urlEncode(wordUTF));

 		switch (engine) {

 		case SEARCHENGINE_WIKIPEDIA:

 			mir_snprintf(szURL, SIZEOF(szURL), "http://en.wikipedia.org/wiki/%s", wordURL);

diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp
index 55ee58c017..f1366e1521 100644
--- a/plugins/SecureIM/src/svcs_proto.cpp
+++ b/plugins/SecureIM/src/svcs_proto.cpp
@@ -104,7 +104,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 	if (ssig == SiG_NONE && !ptr->msgSplitted) {

 		Sent_NetLog("onRecvMsg: non-secure message");

 

-		MCBuf szPlainMsg((ppre->flags & PREF_UNICODE) ? m_awstrcat(Translate(sim402),szEncMsg) : m_aastrcat(Translate(sim402),szEncMsg));

+		ptrA szPlainMsg((ppre->flags & PREF_UNICODE) ? m_awstrcat(Translate(sim402),szEncMsg) : m_aastrcat(Translate(sim402),szEncMsg));

 		ppre->szMessage = szPlainMsg;

 		pccsd->wParam |= PREF_SIMNOMETA;

 		return CallService(MS_PROTO_CHAINRECV, wParam, lParam);

@@ -189,7 +189,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 			szNewMsg = m_ustrcat(Translate(sim403), szOldMsg);

 			szOldMsg = szNewMsg;

 		}

-		MCBuf szMsgUtf( utf8_to_miranda(szOldMsg, ppre->flags));

+		ptrA szMsgUtf( utf8_to_miranda(szOldMsg, ppre->flags));

 		pccsd->wParam = ppre->flags;

 		ppre->szMessage = szMsgUtf;

 

@@ -224,7 +224,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 			if (!szOldMsg)

 				return 1; // don't display it ...

 

-			MCBuf szNewMsg( utf8_to_miranda(szOldMsg, ppre->flags));

+			ptrA szNewMsg( utf8_to_miranda(szOldMsg, ppre->flags));

 			pccsd->wParam = ppre->flags;

 			ppre->szMessage = szNewMsg;

 

@@ -252,7 +252,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 			// reinit key exchange user has send an encrypted message and i have no key

 			cpp_reset_context(ptr->cntx);

 

-			MCBuf reSend((LPSTR)mir_alloc(strlen(szEncMsg)+LEN_RSND));

+			ptrA reSend((LPSTR)mir_alloc(strlen(szEncMsg)+LEN_RSND));

 			strcpy(reSend,SIG_RSND); // copy resend sig

 			strcat(reSend,szEncMsg); // add mess

 

@@ -261,7 +261,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 			pccsd->szProtoService = PSS_MESSAGE;

 			CallService(MS_PROTO_CHAINSEND, wParam, lParam); // send back cipher message

 

-			MCBuf keyToSend( InitKeyA(ptr, 0)); // calculate public and private key

+			ptrA keyToSend( InitKeyA(ptr, 0)); // calculate public and private key

 			pccsd->lParam = (LPARAM)(char*)keyToSend;

 			CallService(MS_PROTO_CHAINSEND, wParam, lParam); // send new key

 

@@ -301,7 +301,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 

 		if (cpp_keyx(ptr->cntx)) {

 			// decrypt sended back message and save message for future sending with a new secret key

-			addMsg2Queue(ptr, pccsd->wParam, MCBuf(decodeMsg(ptr,(LPARAM)pccsd,szEncMsg)));

+			addMsg2Queue(ptr, pccsd->wParam, ptrA(decodeMsg(ptr,(LPARAM)pccsd,szEncMsg)));

 			showPopUpRM(ptr->hContact);

 			showPopUp(sim004,NULL,g_hPOP[POP_PU_DIS],0);

 		}

@@ -373,7 +373,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 			if (ptr->features & CPP_FEATURES_NEWPG) {

 				cpp_reset_context(ptr->cntx);

 

-				MCBuf keyToSend( InitKeyA(ptr,CPP_FEATURES_NEWPG|KEY_A_SIG)); // calculate NEW public and private key

+				ptrA keyToSend( InitKeyA(ptr,CPP_FEATURES_NEWPG|KEY_A_SIG)); // calculate NEW public and private key

 				Sent_NetLog("onRecvMsg: Sending KEYA %s", keyToSend);

 

 				pccsd->wParam |= PREF_METANODB;

@@ -388,7 +388,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 

 			// auto send my public key to keyB user if not done before

 			if (!cpp_keya(ptr->cntx)) {

-				MCBuf keyToSend( InitKeyA(ptr,0)); // calculate public and private key

+				ptrA keyToSend( InitKeyA(ptr,0)); // calculate public and private key

 				Sent_NetLog("onRecvMsg: Sending KEYA %s", keyToSend);

 

 				pccsd->wParam |= PREF_METANODB;

@@ -418,7 +418,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam)
 				return 1;

 			}

 			else {

-				MCBuf keyToSend( InitKeyA(ptr, CPP_FEATURES_NEWPG | KEY_B_SIG)); // calculate NEW public and private key

+				ptrA keyToSend( InitKeyA(ptr, CPP_FEATURES_NEWPG | KEY_B_SIG)); // calculate NEW public and private key

 				Sent_NetLog("onRecvMsg: Sending KEYB %s", keyToSend);

 

 				pccsd->wParam |= PREF_METANODB;

@@ -511,7 +511,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam)
 			if (!ptr->keyLoaded ) return returnError(pccsd->hContact,Translate(sim108));

 

 			LPSTR szNewMsg = NULL;

-			MCBuf szUtfMsg( miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam));

+			ptrA szUtfMsg( miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam));

 			if (ptr->keyLoaded == 1) // PGP

 				szNewMsg = pgp_encode(ptr->cntx,szUtfMsg);

 			else if (ptr->keyLoaded == 2) // GPG

@@ -559,7 +559,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam)
 			}

 

 			// шлем шифрованное в оффлайн

-			exp->rsa_send(ptr->cntx, MCBuf( miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam)));

+			exp->rsa_send(ptr->cntx, ptrA( miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam)));

 			showPopUpSM(ptr->hContact);

 			return returnNoError(pccsd->hContact);

 		}

@@ -591,7 +591,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam)
 

 		// соединение установлено

 		if (ptr->cntx && exp->rsa_get_state(ptr->cntx) == 7) {

-			exp->rsa_send(ptr->cntx, MCBuf(miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam)));

+			exp->rsa_send(ptr->cntx, ptrA(miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam)));

 			ShowStatusIconNotify(ptr->hContact);

 			showPopUpSM(ptr->hContact);

 			return returnNoError(pccsd->hContact);

@@ -738,7 +738,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam)
 	if (cpp_keyx(ptr->cntx)) {

 		Sent_NetLog("onSendMsg: cryptokey exist");

 

-		MCBuf szNewMsg( encodeMsg(ptr,(LPARAM)pccsd));

+		ptrA szNewMsg( encodeMsg(ptr,(LPARAM)pccsd));

 		Sent_NetLog("onSend: encrypted msg '%s'",szNewMsg);

 

 		pccsd->wParam |= PREF_METANODB;

@@ -759,7 +759,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam)
 

 		if (!ptr->waitForExchange) {

 			// init || always_try || always_if_possible

-			MCBuf keyToSend( InitKeyA(ptr,0));	// calculate public and private key & fill KeyA

+			ptrA keyToSend( InitKeyA(ptr,0));	// calculate public and private key & fill KeyA

 			Sent_NetLog("Sending KEY3: %s", keyToSend);

 

 			pccsd->wParam &= ~PREF_UNICODE;

diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index 87ae2c4e03..de2455ef84 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -503,7 +503,7 @@ INT_PTR OpenSessionsManagerWindow(WPARAM wparam,LPARAM lparam)
 		return 0;

 	}

 	

-	MTBuf 

+	ptrT 

 		tszSession(db_get_tsa(NULL, MODNAME, "SessionDate_0")),

 		tszUserSession(db_get_tsa(NULL, MODNAME, "UserSessionDsc_0"));

 	if (g_bIncompletedSave || tszSession || tszUserSession) {

diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index 8ced5bc7d3..608da025a6 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -137,7 +137,7 @@ static INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 

 						val = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(i, "Flags"), STATUS_DEFAULT);

 						data->status_msg[0].flags[i - ID_STATUS_ONLINE] = val;

-						MTBuf text = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(i, "Default"));

+						ptrT text = db_get_tsa(NULL, "SRAway", StatusModeToDbSetting(i, "Default"));

 						lstrcpyn(data->status_msg[0].msg[i - ID_STATUS_ONLINE], (text == NULL) ? GetDefaultMessage(i) : text, 1024);

 

 						for (j = 0; j < accounts->count; j++)

diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index a74bf594f8..ebc0f3036d 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -64,7 +64,7 @@ class COptions
 			iStatus(_status)

 		{}

 

-		MCBuf szProto;

+		ptrA szProto;

 		int iStatus;

 	};

 

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 23bb20b231..6320547b24 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -3113,10 +3113,10 @@ LABEL_SHOWWINDOW:
 					if (GetSendButtonState(hwndDlg) != PBS_DISABLED) {

 						MODULEINFO *mi = MM_FindModule(si->pszModule);

 

-						MCBuf pszRtf( Chat_Message_GetFromStream(hwndDlg, si));

+						ptrA pszRtf( Chat_Message_GetFromStream(hwndDlg, si));

 						SM_AddCommand(si->ptszID, si->pszModule, pszRtf);

 

-						MTBuf ptszText( Chat_DoRtfToTags(pszRtf, si));

+						ptrT ptszText( Chat_DoRtfToTags(pszRtf, si));

 						if ((TCHAR*)ptszText == NULL)

 							break;

 

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 3951c4efb1..76c525af53 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -554,11 +554,11 @@ static TCHAR *GetPreviewT(WORD eventType, DBEVENTINFO* dbe)
 				if (dbe->cbBlob > (sizeof(DWORD) + namelength + 1))

 					szDescr = szFileName + namelength + 1;

 

-				MTBuf tszFileName( DbGetEventStringT(dbe, szFileName));

+				ptrT tszFileName( DbGetEventStringT(dbe, szFileName));

 				TCHAR buf[1024];

 

 				if (szDescr && Utils::safe_strlen(szDescr, dbe->cbBlob - sizeof(DWORD) - namelength - 1) > 0) {

-					MTBuf tszDescr( DbGetEventStringT(dbe, szDescr));

+					ptrT tszDescr( DbGetEventStringT(dbe, szDescr));

 					if (tszFileName && tszDescr) {

 						mir_sntprintf(buf, SIZEOF(buf), _T("%s: %s (%s)"), TranslateT("Incoming file"), tszFileName, tszDescr);

 						return mir_tstrdup(buf);

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 40bbbeaeb8..fb8d333562 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -712,7 +712,7 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 				mir_sntprintf(buffer, SIZEOF(buffer), TranslateT("changed status from %s to %s."), szOldStatus, szNewStatus);

 		}

 

-		MCBuf szMsg( mir_utf8encodeT(buffer));

+		ptrA szMsg( mir_utf8encodeT(buffer));

 		DBEVENTINFO dbei = { sizeof(dbei) };

 		dbei.pBlob = (PBYTE)(char*)szMsg;

 		dbei.cbBlob = lstrlenA(szMsg) + 1;

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index f4bcfabd11..9132ad10bd 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -901,7 +901,7 @@ INT_PTR CALLBACK CSendLater::DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 							job->writeFlags();

 							break;

 						case ID_QUEUEMANAGER_COPYMESSAGETOCLIPBOARD:

-							Utils::CopyToClipBoard((TCHAR*)MTBuf( mir_utf8decodeT(job->sendBuffer)), m_hwndDlg);

+							Utils::CopyToClipBoard((TCHAR*)ptrT( mir_utf8decodeT(job->sendBuffer)), m_hwndDlg);

 							break;

 						case ID_QUEUEMANAGER_RESETSELECTED:

 							if (job->bCode == CSendLaterJob::JOB_DEFERRED) {

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 0367e22dcb..d4a3941f7b 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -136,7 +136,7 @@ static int SendChunkW(WCHAR *chunk, HANDLE hContact, DWORD dwFlags)
 	int mbcsSize = WideCharToMultiByte(codePage, 0, chunk, -1, NULL, 0, 0, 0);

 	memRequired += mbcsSize;

 

-	MCBuf pBuf((char*)mir_alloc(memRequired));

+	ptrA pBuf((char*)mir_alloc(memRequired));

 	WideCharToMultiByte(codePage, 0, chunk, -1, pBuf, mbcsSize, 0, 0);

 	CopyMemory(&pBuf[mbcsSize], chunk, (wLen+1) * sizeof(WCHAR));

 	return CallContactService(hContact, PSS_MESSAGE, dwFlags, (LPARAM)pBuf);

diff --git a/plugins/Variables/src/variables.cpp b/plugins/Variables/src/variables.cpp
index d42d8f55db..7341259e7d 100644
--- a/plugins/Variables/src/variables.cpp
+++ b/plugins/Variables/src/variables.cpp
@@ -502,7 +502,7 @@ TCHAR *formatString(FORMATINFO *fi)
 	if ((fi == NULL) || (fi->tszFormat == NULL))

 		return NULL;

 

-	MTBuf string( mir_tstrdup(fi->tszFormat));

+	ptrT string( mir_tstrdup(fi->tszFormat));

 	if (string == NULL)

 		return NULL;

 

diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp
index 1e7491249a..cc51c71e26 100644
--- a/plugins/Weather/src/weather_addstn.cpp
+++ b/plugins/Weather/src/weather_addstn.cpp
@@ -308,8 +308,8 @@ int NameSearchProc(TCHAR *name, const int searchId, WINAMESEARCH *sData, TCHAR *
 

 	// replace spaces with %20

 	char loc[256];

-	MCBuf szSearchName( mir_utf8encodeT(name));

-	wsprintfA(loc, sData->SearchURL, MCBuf( mir_urlEncode(szSearchName)));

+	ptrA szSearchName( mir_utf8encodeT(name));

+	wsprintfA(loc, sData->SearchURL, ptrA( mir_urlEncode(szSearchName)));

 	if (InternetDownloadFile(loc, NULL, &szData) == 0) {

 		TCHAR* szInfo = szData;

 		search = _tcsstr(szInfo, sData->NotFoundStr);	// determine if data is available

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index 1954c84f15..838705e82f 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -137,7 +137,7 @@ INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 								break;

 

 							case DBVT_UTF8:

-								_tcscpy(uid, MTBuf(mir_utf8decodeT(dbvuid.pszVal)));

+								_tcscpy(uid, ptrT(mir_utf8decodeT(dbvuid.pszVal)));

 								break;

 							}

 

@@ -344,7 +344,7 @@ INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wParam, L
 						break;

 

 					case DBVT_UTF8:

-						_tcscpy(uid, MTBuf( mir_utf8decodeT(dbvuid.pszVal)));

+						_tcscpy(uid, ptrT( mir_utf8decodeT(dbvuid.pszVal)));

 						break;

 					}

 

diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp
index 2a37b58c81..b6e479e9db 100644
--- a/plugins/YARelay/src/main.cpp
+++ b/plugins/YARelay/src/main.cpp
@@ -135,7 +135,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 

 	// build a message

 	Buffer<char> szUtfMsg;

-	MCBuf szTemplate( mir_utf8encodeT(tszForwardTemplate));

+	ptrA szTemplate( mir_utf8encodeT(tszForwardTemplate));

 	for (char *p = szTemplate; *p; p++) {

 		if (*p != '%') {

 			szUtfMsg.append(*p);

@@ -146,7 +146,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 		switch(*++p) {

 		case 'u':

 		case 'U':

-			szUtfMsg.append( MCBuf(mir_utf8encodeT(pcli->pfnGetContactDisplayName(hContact, 0))));

+			szUtfMsg.append( ptrA(mir_utf8encodeT(pcli->pfnGetContactDisplayName(hContact, 0))));

 			break;

 

 		case 'i':

@@ -167,19 +167,19 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 				}

 				else mir_sntprintf(buf, SIZEOF(buf), _T("%p"), hContact);

 			}

-			szUtfMsg.append( MCBuf(mir_utf8encodeT(buf)));

+			szUtfMsg.append( ptrA(mir_utf8encodeT(buf)));

 			break;

 

 		case 't':

 		case 'T':

 			_tcsftime(buf, 10, _T("%H:%M"), tm_time);

-			szUtfMsg.append( MCBuf(mir_utf8encodeT(buf)));

+			szUtfMsg.append( ptrA(mir_utf8encodeT(buf)));

 			break;

 

 		case 'd':

 		case 'D':

 			_tcsftime(buf, 12, _T("%d/%m/%Y"), tm_time);

-			szUtfMsg.append( MCBuf(mir_utf8encodeT(buf)));

+			szUtfMsg.append( ptrA(mir_utf8encodeT(buf)));

 			break;

 

 		case 'm':

@@ -187,7 +187,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 			if (dbei.flags & DBEF_UTF)

 				szUtfMsg.append((char*)dbei.pBlob, dbei.cbBlob);

 			else

-				szUtfMsg.append( MCBuf(mir_utf8encode((char*)dbei.pBlob)));

+				szUtfMsg.append( ptrA(mir_utf8encode((char*)dbei.pBlob)));

 			break;

 

 		case '%':