- Another portion of _T replacement (patch from person)

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

8 files changed, 29 insertions, 29 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index 082f3e961a..f174ab98b4 100644
--- a/plugins/SendScreenshotPlus/src/CSend.h
+++ b/plugins/SendScreenshotPlus/src/CSend.h
@@ -52,8 +52,8 @@ Last change by : $Author: ing.u.horn $
 #define GC_RESULT_ERROR				202

 #define GC_RESULT_NOSESSION			209

 

-#define SS_ERR_INIT					_T("Unable to initiate %s.")

-#define SS_ERR_MAPI					_T("MAPI error (%i):\n%s.")

+#define SS_ERR_INIT					LPGENT("Unable to initiate %s.")

+#define SS_ERR_MAPI					LPGENT("MAPI error (%i):\n%s.")

 

 //---------------------------------------------------------------------------

 class CSend {

diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
index 7026ae13ef..cc8dc8c0d4 100644
--- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
@@ -159,46 +159,46 @@ void CSendEmail::SendThread() {
 

 			// No message was sent

 			case MAPI_E_AMBIGUOUS_RECIPIENT:

-				err = _T("A recipient matched more than one of the recipient descriptor structures and MAPI_DIALOG was not set");

+				err = LPGENT("A recipient matched more than one of the recipient descriptor structures and MAPI_DIALOG was not set");

 				break;

 			case MAPI_E_ATTACHMENT_NOT_FOUND:

-				err = _T("The specified attachment was not found");

+				err = LPGENT("The specified attachment was not found");

 				break;

 			case MAPI_E_ATTACHMENT_OPEN_FAILURE:

-				err = _T("The specified attachment could not be opened");

+				err = LPGENT("The specified attachment could not be opened");

 				break;

 			case MAPI_E_BAD_RECIPTYPE:

-				err = _T("The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC");

+				err = LPGENT("The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC");

 				break;

 			case MAPI_E_FAILURE:

-				err = _T("One or more unspecified errors occurred");

+				err = LPGENT("One or more unspecified errors occurred");

 				break;

 			case MAPI_E_INSUFFICIENT_MEMORY:

-				err = _T("There was insufficient memory to proceed");

+				err = LPGENT("There was insufficient memory to proceed");

 				break;

 			case MAPI_E_INVALID_RECIPS:

-				err = _T("One or more recipients were invalid or did not resolve to any address");

+				err = LPGENT("One or more recipients were invalid or did not resolve to any address");

 				break;

 			case MAPI_E_LOGIN_FAILURE:

-				err = _T("There was no default logon, and the user failed to log on successfully when the logon dialog box was displayed");

+				err = LPGENT("There was no default logon, and the user failed to log on successfully when the logon dialog box was displayed");

 				break;

 			case MAPI_E_TEXT_TOO_LARGE:

-				err = _T("The text in the message was too large");

+				err = LPGENT("The text in the message was too large");

 				break;

 			case MAPI_E_TOO_MANY_FILES:

-				err = _T("There were too many file attachments");

+				err = LPGENT("There were too many file attachments");

 				break;

 			case MAPI_E_TOO_MANY_RECIPIENTS:

-				err = _T("There were too many recipients");

+				err = LPGENT("There were too many recipients");

 				break;

 			case MAPI_E_UNKNOWN_RECIPIENT:

-				err = _T("A recipient did not appear in the address list");

+				err = LPGENT("A recipient did not appear in the address list");

 				break;

 			case MAPI_E_USER_ABORT:

-				err = _T("The user canceled one of the dialog boxes");

+				err = LPGENT("The user canceled one of the dialog boxes");

 				break;

 			default:

-				err = _T("Unknown Error");

+				err = LPGENT("Unknown Error");

 				break;

 		}

 		Error(SS_ERR_MAPI, res, err);

diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
index d7512d2fe6..3d33389d81 100644
--- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
@@ -38,7 +38,7 @@ Last change by : $Author: ing.u.horn $
 CSendFTPFile::CSendFTPFile(HWND Owner, HANDLE hContact, bool bFreeOnExit)

 : CSend(Owner, hContact, bFreeOnExit){

 	m_EnableItem		= NULL ; //SS_DLG_DESCRIPTION| SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;

-	m_pszSendTyp		= _T("FTPFile transfer");

+	m_pszSendTyp		= LPGENT("FTPFile transfer");

 	m_pszFileName		= NULL;

 	m_URL				= NULL;

 }

@@ -78,7 +78,7 @@ void CSendFTPFile::SendThread() {
 

 	ret = (int)CallService(MS_FTPFILE_SHAREFILE, (WPARAM)m_hContact, (LPARAM)m_pszFileName);

 	if (ret != 0) {

-		Error(_T("%s (%i):\nCould not add a share to the FTP File plugin."),TranslateTS(m_pszSendTyp),ret);

+		Error(TranslateT("%s (%i):\nCould not add a share to the FTP File plugin."),TranslateTS(m_pszSendTyp),ret);

 		Exit(ret);

 	}

 

diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index 819086ead7..1c21a736f2 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
@@ -58,7 +58,7 @@ CSendHTTPServer::~CSendHTTPServer(){
 void	CSendHTTPServer::Send() {

 

 	if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, (WPARAM)true, 0) != 0) {

-		Error(NULL, _T("Could not start the HTTP Server plugin."));

+		Error(NULL, TranslateT("Could not start the HTTP Server plugin."));

 		return;

 	}

 

@@ -104,7 +104,7 @@ void CSendHTTPServer::SendThread() {
 	}

 

 	if (ret != 0) {

-		Error(_T("%s (%i):\nCould not add a share to the HTTP Server plugin."),TranslateTS(m_pszSendTyp),ret);

+		Error(TranslateT("%s (%i):\nCould not add a share to the HTTP Server plugin."),TranslateTS(m_pszSendTyp),ret);

 		Exit(ret);

 	}

 

diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
index a27b4f5273..20d1dfd87e 100644
--- a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
@@ -224,7 +224,7 @@ void CSendImageShack::SendThread() {
 			}

 		}

 		else {

-				Error(NULL, _T("Upload server did not respond timely."));

+				Error(NULL, TranslateT("Upload server did not respond timely."));

 		}

 		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM) m_nlreply);

 		m_nlreply = NULL;

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 58d92dd8aa..209028bb9a 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -103,7 +103,7 @@ extern "C" int __declspec(dllexport) Load(void) {
 	INT_PTR result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&FIP);

 

 	if(FIP == NULL || result != S_OK) {

-		MessageBoxEx(NULL, TranslateT("Fatal error, image services not found. Send Screenshot will be disabled."), _T("Error"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);

+		MessageBoxEx(NULL, TranslateT("Fatal error, image services not found. Send Screenshot will be disabled."), TranslateT("Error"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);

 		return 1;

 	}

 

diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 3059c23f67..03990201eb 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -40,7 +40,7 @@ INT_PTR CALLBACK TfrmMain::DlgProc_CaptureWindow(HWND hDlg, UINT uMsg, WPARAM wP
 	switch (uMsg) {

 	case WM_INITDIALOG:

 		Static_SetIcon(GetDlgItem(hDlg, ID_imgTarget), IcoLib_GetIcon(ICO_PLUG_SSTARGET));

-		SetDlgItemText(hDlg, ID_edtCaption, _T("Drag&&Drop the target on the desired window."));

+		SetDlgItemText(hDlg, ID_edtCaption, TranslateT("Drag&&Drop the target on the desired window."));

 		TranslateDialogDefault(hDlg);

 		break;

 	case WM_CTLCOLOREDIT:		//ctrl is NOT read-only or disabled 

@@ -974,14 +974,14 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) {
 

 	//Generate a description according to the screenshot

 	TCHAR winText[1024];

-	mir_tcsadd(pszFileDesc, _T("Screenshot "));

+	mir_tcsadd(pszFileDesc, TranslateT("Screenshot "));

 	if (m_opt_tabCapture == 0 && m_opt_chkClientArea) {

-		mir_tcsadd(pszFileDesc, _T("for Client area "));

+		mir_tcsadd(pszFileDesc, TranslateT("for Client area "));

 	}

-	mir_tcsadd(pszFileDesc, _T("of \""));

+	mir_tcsadd(pszFileDesc, TranslateT("of \""));

 	GetDlgItemText(m_hwndTabPage, ID_edtCaption, winText, 1024);

 	mir_tcsadd(pszFileDesc, winText);

-	mir_tcsadd(pszFileDesc, _T("\" Window"));

+	mir_tcsadd(pszFileDesc, TranslateT("\" Window"));

 

 	// convert to 32Bits (make shure it is 32bit)

 	FIBITMAP *dib_new = FIP->FI_ConvertTo32Bits(dib);

diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h
index 7fe0c9b182..a9d22c898a 100644
--- a/plugins/SendScreenshotPlus/src/global.h
+++ b/plugins/SendScreenshotPlus/src/global.h
@@ -33,7 +33,7 @@ Last change by : $Author: ing.u.horn $
 #ifndef _GLOBAL_H_

 #define _GLOBAL_H_

 

-#define _CRT_SECURE_NO_WARNINGS

+//#define _CRT_SECURE_NO_WARNINGS

 #define WINVER			0x0700

 #define _WIN32_WINNT	0x0700

 #define _WIN32_IE		0x0601

@@ -123,7 +123,7 @@ typedef struct _MGLOBAL {
 } MGLOBAL, *LPMGLOBAL;

 

 //---------------------------------------------------------------------------

-#define ERROR_TITLE		_T("SendScreenshot - Error")

+#define ERROR_TITLE		TranslateT("SendScreenshot - Error")

 

 // Miranda Database Key

 #define SZ_SENDSS		"SendSS"