no more TCHARs

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

3 files changed, 10 insertions, 10 deletions

diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index 2db83b8a7c..b163428edb 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -77,7 +77,7 @@ void AddMessage(const wchar_t* fmt, ...)
 	va_list args;

 	wchar_t msgBuf[4096];

 	va_start(args, fmt);

-	mir_vsnwprintf(msgBuf, _countof(msgBuf), TranslateTS(fmt), args);

+	mir_vsnwprintf(msgBuf, _countof(msgBuf), TranslateW(fmt), args);

 

 	SendMessage(hdlgProgress, PROGM_ADDMESSAGE, 0, (LPARAM)msgBuf);

 }

@@ -113,7 +113,7 @@ static int myGetD(MCONTACT hContact, const char *szModule, const char *szSetting
 

 static wchar_t* myGetWs(MCONTACT hContact, const char *szModule, const char *szSetting)

 {

-	DBVARIANT dbv = { DBVT_TCHAR };

+	DBVARIANT dbv = { DBVT_WCHAR };

 	return srcDb->GetContactSettingStr(hContact, szModule, szSetting, &dbv) ? NULL : dbv.ptszVal;

 }

 

@@ -143,7 +143,7 @@ static MCONTACT HContactFromID(char *pszProtoName, char *pszSetting, wchar_t *pw
 	for (MCONTACT hContact = dstDb->FindFirstContact(); hContact; hContact = dstDb->FindNextContact(hContact)) {

 		char *szProto = GetContactProto(hContact);

 		if (!mir_strcmp(szProto, pszProtoName)) {

-			ptrW id(db_get_tsa(hContact, pszProtoName, pszSetting));

+			ptrW id(db_get_wsa(hContact, pszProtoName, pszSetting));

 			if (!mir_wstrcmp(pwszID, id))

 				return hContact;

 		}

@@ -500,7 +500,7 @@ bool ImportAccounts(OBJLIST<char> &arSkippedModules)
 		if (p.tszSrcName == NULL) {

 			p.pa->tszAccountName = mir_a2u(p.pa->szModuleName);

 			itoa(800 + p.pa->iOrder, szSetting, 10);

-			db_set_ts(NULL, "Protocols", szSetting, p.pa->tszAccountName);

+			db_set_ws(NULL, "Protocols", szSetting, p.pa->tszAccountName);

 		}

 

 		CopySettings(NULL, p.szSrcAcc, NULL, p.pa->szModuleName);

diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp
index bed803d016..a177685952 100644
--- a/plugins/Import/src/miranda.cpp
+++ b/plugins/Import/src/miranda.cpp
@@ -71,10 +71,10 @@ INT_PTR CALLBACK MirandaPageProc(HWND hwndDlg, UINT message, WPARAM wParam, LPAR
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 		{

-			VARST pfd(L"%miranda_path%\\Profiles");

-			VARST pfd1(L"%miranda_path%");

-			VARST pfd2(L"%miranda_profilesdir%");

-			VARST pfn(L"%miranda_profilename%");

+			VARSW pfd(L"%miranda_path%\\Profiles");

+			VARSW pfd1(L"%miranda_path%");

+			VARSW pfd2(L"%miranda_profilesdir%");

+			VARSW pfn(L"%miranda_profilename%");

 

 			SearchForLists(hwndDlg, pfd2, pfn);

 			SearchForLists(hwndDlg, pfd1, NULL);

diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp
index 59adce72b9..b854ae9ab9 100644
--- a/plugins/Import/src/utils.cpp
+++ b/plugins/Import/src/utils.cpp
@@ -36,7 +36,7 @@ int CreateGroup(const wchar_t *group, MCONTACT hContact)
 

 	if (Clist_GroupExists(group)) {

 		if (hContact)

-			db_set_ts(hContact, "CList", "Group", group);

+			db_set_ws(hContact, "CList", "Group", group);

 		else

 			AddMessage(LPGENW("Skipping duplicate group %s."), group);

 		return 0;

@@ -44,7 +44,7 @@ int CreateGroup(const wchar_t *group, MCONTACT hContact)
 

 	Clist_GroupCreate(NULL, group);

 	if (hContact)

-		db_set_ts(hContact, "CList", "Group", group);

+		db_set_ws(hContact, "CList", "Group", group);

 	return 1;

 }