less TCHARs

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

7 files changed, 20 insertions, 20 deletions

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 96cd972f8c..74f2a84c49 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -256,7 +256,7 @@ MCONTACT CExImContactBase::toDB()
 
 		// add group
 		if (_pszGroup) {
-			ptrT ptszGroup(mir_utf8decodeT(_pszGroup));
+			ptrW ptszGroup(mir_utf8decodeW(_pszGroup));
 			db_set_ts(_hContact, MOD_CLIST, "Group", ptszGroup);
 			Clist_GroupCreate(NULL, ptszGroup);
 		}
@@ -291,7 +291,7 @@ void CExImContactBase::toIni(FILE* file, int modCount)
 		}
 		else {
 			// Proto loaded - GetContactName(hContact,pszProto,0)
-			ptrT pszCI(Contact_GetInfo(CNF_DISPLAY, _hContact, _pszProto));
+			ptrW pszCI(Contact_GetInfo(CNF_DISPLAY, _hContact, _pszProto));
 			ptrA pszUID(uid2String(FALSE));
 			if (_pszUIDKey && pszUID)
 				mir_snprintf(name, "%S *(%s)*<%s>*{%s}*", pszCI, _pszProto, _pszUIDKey, pszUID);
@@ -475,8 +475,8 @@ BYTE CExImContactBase::isHandle(MCONTACT hContact)
 	// compare nicknames if no UID
 	else if (!DB::Setting::GetUString(hContact, _pszProto, SET_CONTACT_NICK, &dbv)) {
 		if (dbv.type == DBVT_UTF8 && dbv.pszVal && !mir_strcmpi(dbv.pszVal,_pszNick)) {
-			LPTSTR ptszNick = mir_utf8decodeT(_pszNick);
-			LPTSTR ptszProto = mir_a2t(_pszProto);
+			LPTSTR ptszNick = mir_utf8decodeW(_pszNick);
+			LPTSTR ptszProto = mir_a2u(_pszProto);
 			int ans = MsgBox(NULL, MB_ICONQUESTION|MB_YESNO, LPGENW("Question"), LPGENW("contact identification"),
 				LPGENW("The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?"),
 				ptszNick, ptszProto);
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index e75750654f..4a9b06f82e 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -688,7 +688,7 @@ int CExImContactXML::Import(BYTE keepMetaSubContact)
 				do {

 					// update progressbar and abort if user clicked cancel

 					int result = _pXmlFile->_progress.UpdateContact(L"Sub Contact: %s (%S)", 

-						ptrT(mir_utf8decodeT(xContact->Attribute("nick"))), xContact->Attribute("proto"));

+						ptrW(mir_utf8decodeW(xContact->Attribute("nick"))), xContact->Attribute("proto"));

 					

 					// user clicked abort button

 					if (!result) break;

@@ -739,8 +739,8 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact)
 		if (err == FALSE) {

 			// ask to delete new contact

 			if (_isNewContact && _hContact != NULL) {

-				LPTSTR ptszNick = mir_utf8decodeT(_pszNick);

-				LPTSTR ptszMetaNick = mir_utf8decodeT(pMetaContact->_pszNick);

+				LPTSTR ptszNick = mir_utf8decodeW(_pszNick);

+				LPTSTR ptszMetaNick = mir_utf8decodeW(pMetaContact->_pszNick);

 				int result = MsgBox(NULL, MB_YESNO|MB_ICONWARNING, 

 					LPGENW("Question"), 

 					LPGENW("Importing a new meta subcontact failed!"), 

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index 10c51971b4..13d8558ec7 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -221,7 +221,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 				}

 				TranslateDialogDefault(hDlg);			//to translate oldTitle

 				GetWindowText(hDlg, oldTitle, _countof(oldTitle));

-				mir_sntprintf(newTitle, L"%s - %s", name, oldTitle);

+				mir_snwprintf(newTitle, L"%s - %s", name, oldTitle);

 				SetWindowText(hDlg, newTitle);

 			}

 

@@ -301,7 +301,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 												case EXIM_GROUP:

 													break;

 												case EXIM_SUBGROUP:

-													if (mir_tstrncmp(pDat->ExImContact->ptszName, DB::Setting::GetTString(hContact, "CList", "Group"), mir_tstrlen(pDat->ExImContact->ptszName))) {

+													if (mir_wstrncmp(pDat->ExImContact->ptszName, DB::Setting::GetTString(hContact, "CList", "Group"), mir_wstrlen(pDat->ExImContact->ptszName))) {

 														continue;

 													}

 													break;

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index 380e238788..36886e384f 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -114,7 +114,7 @@ static LRESULT CALLBACK PlacesBarSubclassProc(HWND hWnd, UINT uMsg, WPARAM wPara
 			// miranda button

 			switch (tbb->idCommand) {

 			case 41063:

-				mir_tstrncpy(szBtnText, TranslateT("Miranda NG"), _countof(szBtnText));

+				mir_wstrncpy(szBtnText, TranslateT("Miranda NG"), _countof(szBtnText));

 				iString = SendMessage(hWnd, TB_ADDSTRING, NULL, (LPARAM)szBtnText);

 				if (iString != -1) tbb->iString = iString;

 				// set tooltip

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index 92981e12d7..ea71cc0d20 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -191,7 +191,7 @@ BYTE CProgress::UpdateContact(LPCTSTR pszFormat, ...)
 			va_list vl;

 

 			va_start(vl, pszFormat);

-			mir_vsntprintf(buf, _countof(buf), TranslateTS(pszFormat), vl);

+			mir_vsnwprintf(buf, _countof(buf), TranslateTS(pszFormat), vl);

 			va_end(vl);

 			SetDlgItemText(_hDlg, TXT_CONTACT, buf);	 

 		}

@@ -218,10 +218,10 @@ BYTE CProgress::UpdateSetting(LPCTSTR pszFormat, ...)
 			va_list vl;

 

 			va_start(vl, pszFormat);

-			mir_vsntprintf(buf, _countof(buf), TranslateTS(pszFormat), vl);

+			mir_vsnwprintf(buf, _countof(buf), TranslateTS(pszFormat), vl);

 			va_end(vl);

 			GetDlgItemText(_hDlg, TXT_SETTING, tmp, _countof(tmp));

-			if (mir_tstrcmpi(tmp,buf))

+			if (mir_wstrcmpi(tmp,buf))

 				SetDlgItemText(_hDlg, TXT_SETTING, buf);

 		}

 		SendMessage(hProg, PBM_SETPOS, (int)SendMessage(hProg, PBM_GETPOS, 0, 0) + 1, 0);

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index 30f7151067..2ac2aaa37d 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -164,7 +164,7 @@ int CFileXml::Export(lpExImParam ExImContact, LPCSTR pszFileName)
 						// dont export meta subcontacts by default and

 						// export only contact with selectet group name

 						if (!db_mc_isSub(hContact) && 

-							mir_tstrncmp(ExImContact->ptszName, DB::Setting::GetTString(hContact, "CList", "Group"), mir_tstrlen(ExImContact->ptszName))== 0)

+							mir_wstrncmp(ExImContact->ptszName, DB::Setting::GetTString(hContact, "CList", "Group"), mir_wstrlen(ExImContact->ptszName))== 0)

 							{

 							if (vContact.fromDB(hContact)) {

 								vContact.Export(xmlfile, &Modules);

@@ -253,7 +253,7 @@ int CFileXml::ImportContacts(TiXmlElement* xmlParent)
 	for (TiXmlElement *xContact = xmlParent->FirstChildElement(); xContact != NULL; xContact = xContact->NextSiblingElement()) {

 		if (!mir_strcmpi(xContact->Value(), XKEY_CONTACT)) {

 			// update progressbar and abort if user clicked cancel

-			LPTSTR pszNick = mir_utf8decodeT(xContact->Attribute("nick"));

+			LPTSTR pszNick = mir_utf8decodeW(xContact->Attribute("nick"));

 			// user clicked abort button

 			if (_progress.UpdateContact(LPGENW("Contact: %s (%S)"), pszNick, xContact->Attribute("proto"))) {

 				int result = vContact.LoadXmlElemnt(xContact);

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index 864129010c..078f0ee27d 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -53,17 +53,17 @@ static void DisplayNameToFileName(lpExImParam ExImContact, LPSTR pszFileName, WO
 				return;

 			}

 			

-			disp = temp = mir_t2a(pcli->pfnGetContactDisplayName(ExImContact->hContact, NULL));

+			disp = temp = mir_u2a(pcli->pfnGetContactDisplayName(ExImContact->hContact, NULL));

 			break;

 

 		case EXIM_SUBGROUP:

-			temp = mir_t2a(ExImContact->ptszName);

+			temp = mir_u2a(ExImContact->ptszName);

 			disp = temp;

 			break;

 

 		case EXIM_ACCOUNT:

 			PROTOACCOUNT* acc = Proto_GetAccount(ExImContact->pszName);

-			disp = temp = mir_t2a(acc->tszAccountName);

+			disp = temp = mir_u2a(acc->tszAccountName);

 			break;

 	}

 

@@ -280,8 +280,8 @@ INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM)
 	while (hItem) {

 		if (SendMessage(hClist,CLM_GETITEMTYPE, (WPARAM)hItem, 0) == CLCIT_GROUP) {

 			SendMessage(hClist,CLM_GETITEMTEXT, (WPARAM)hItem, (LPARAM)ptszItem);

-			LPTSTR temp = mir_tstrdup(ptszGroup);

-			mir_sntprintf(tszGroup, L"%s%s%s", ptszItem, mir_tstrlen(temp)? L"\\":L"", temp);

+			LPTSTR temp = mir_wstrdup(ptszGroup);

+			mir_snwprintf(tszGroup, L"%s%s%s", ptszItem, mir_wstrlen(temp)? L"\\":L"", temp);

 			mir_free (temp);

 		}

 		hParent = SendMessage(hClist,CLM_GETNEXTITEM, (WPARAM)CLGN_PARENT, (LPARAM)hItem);