less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

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

3 files changed, 10 insertions, 10 deletions

diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp
index 96d331ceea..f611fce2f5 100644
--- a/plugins/YARelay/src/main.cpp
+++ b/plugins/YARelay/src/main.cpp
@@ -26,7 +26,7 @@ HINSTANCE hInst;
 int hLangpack;

 

 MCONTACT hForwardFrom, hForwardTo;

-TCHAR tszForwardTemplate[MAXTEMPLATESIZE]; 

+wchar_t tszForwardTemplate[MAXTEMPLATESIZE]; 

 int iSplit, iSplitMaxSize, iSendParts, iMarkRead, iSendAndHistory, iForwardOnStatus;

 

 LIST<MESSAGE_PROC> arMessageProcs(10, HandleKeySortT);

@@ -141,7 +141,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDBEvent)
 			continue;

 		}

 

-		TCHAR buf[100];

+		wchar_t buf[100];

 		switch(*++p) {

 		case 'u':

 		case 'U':

@@ -153,7 +153,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDBEvent)
 			{

 				ptrT id(Contact_GetInfo(CNF_UNIQUEID, NULL));

 				if (id != NULL)

-					_tcsncpy_s(buf, id, _TRUNCATE);

+					wcsncpy_s(buf, id, _TRUNCATE);

 				else

 					mir_sntprintf(buf, L"%p", hContact);

 			}

@@ -162,13 +162,13 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDBEvent)
 

 		case 't':

 		case 'T':

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

+			wcsftime(buf, 10, L"%H:%M", tm_time);

 			szUtfMsg.append(T2Utf(buf));

 			break;

 

 		case 'd':

 		case 'D':

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

+			wcsftime(buf, 12, L"%d/%m/%Y", tm_time);

 			szUtfMsg.append(T2Utf(buf));

 			break;

 

@@ -230,12 +230,12 @@ extern "C" int __declspec(dllexport) Load()
 

 	iForwardOnStatus = db_get_dw(NULL, "yaRelay", "ForwardOnStatus", STATUS_OFFLINE | STATUS_AWAY | STATUS_NA);

 

-	TCHAR *szForwardTemplate = db_get_tsa(NULL, "yaRelay", "ForwardTemplate");

+	wchar_t *szForwardTemplate = db_get_tsa(NULL, "yaRelay", "ForwardTemplate");

 	if (szForwardTemplate){

-		_tcsncpy(tszForwardTemplate, szForwardTemplate, _countof(tszForwardTemplate));

+		wcsncpy(tszForwardTemplate, szForwardTemplate, _countof(tszForwardTemplate));

 		mir_free(szForwardTemplate);

 	}

-	else _tcsncpy(tszForwardTemplate, L"%u: %m", MAXTEMPLATESIZE-1);

+	else wcsncpy(tszForwardTemplate, L"%u: %m", MAXTEMPLATESIZE-1);

 

 	iSplit          = db_get_dw(NULL, "yaRelay", "Split", 0);

 	iSplitMaxSize   = db_get_dw(NULL, "yaRelay", "SplitMaxSize", 100);

diff --git a/plugins/YARelay/src/options.cpp b/plugins/YARelay/src/options.cpp
index 198905d6e1..66a00bbe04 100644
--- a/plugins/YARelay/src/options.cpp
+++ b/plugins/YARelay/src/options.cpp
@@ -69,7 +69,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 		SendDlgItemMessage(hwndDlg, IDC_COMBO_TO, CB_SETCURSEL, (WPARAM)idx, 0);

 

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

-			TCHAR *ptszNick = pcli->pfnGetContactDisplayName(hContact, 0);

+			wchar_t *ptszNick = pcli->pfnGetContactDisplayName(hContact, 0);

 			if (ptszNick){

 				idx = SendDlgItemMessage(hwndDlg, IDC_COMBO_TO, CB_ADDSTRING, 0, (LPARAM)ptszNick);

 				SendDlgItemMessage(hwndDlg, IDC_COMBO_TO, CB_SETITEMDATA, (WPARAM)idx, hContact);

diff --git a/plugins/YARelay/src/stdafx.h b/plugins/YARelay/src/stdafx.h
index 01a6ff2792..eef4c08ce8 100644
--- a/plugins/YARelay/src/stdafx.h
+++ b/plugins/YARelay/src/stdafx.h
@@ -47,7 +47,7 @@ Features:
 extern HINSTANCE hInst;

 

 extern MCONTACT hForwardFrom, hForwardTo;

-extern TCHAR tszForwardTemplate[MAXTEMPLATESIZE];

+extern wchar_t tszForwardTemplate[MAXTEMPLATESIZE];

 extern int iSplit, iSplitMaxSize, iSendParts, iMarkRead, iSendAndHistory, iForwardOnStatus;

 

 struct MESSAGE_PROC