hello, Unix.

phase 1: removing _T()

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

4 files changed, 26 insertions, 26 deletions

diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp
index 5d2c21c5db..43a87b679a 100644
--- a/plugins/Exchange/src/MirandaExchange.cpp
+++ b/plugins/Exchange/src/MirandaExchange.cpp
@@ -249,7 +249,7 @@ HRESULT CallOpenEntry( LPMDB lpMDB, LPADRBOOK lpAB, LPMAPICONTAINER lpContainer,
 

 	if (lpMDB)

 	{

-		//Log(_T("CallOpenEntry: Calling OpenEntry on MDB with ulFlags = 0x%X\n"),ulFlags);

+		//Log(L"CallOpenEntry: Calling OpenEntry on MDB with ulFlags = 0x%X\n",ulFlags);

 		lpMDB->OpenEntry(

 			cbEntryID,

 			lpEntryID,

@@ -279,7 +279,7 @@ HRESULT CallOpenEntry( LPMDB lpMDB, LPADRBOOK lpAB, LPMAPICONTAINER lpContainer,
 	if (lpAB && !lpUnk)

 	{

 		hRes = S_OK;

-		//Log(_T("CallOpenEntry: Calling OpenEntry on AB with ulFlags = 0x%X\n"),ulFlags);

+		//Log(L"CallOpenEntry: Calling OpenEntry on AB with ulFlags = 0x%X\n",ulFlags);

 		(lpAB->OpenEntry(

 			cbEntryID,

 			lpEntryID,

@@ -310,7 +310,7 @@ HRESULT CallOpenEntry( LPMDB lpMDB, LPADRBOOK lpAB, LPMAPICONTAINER lpContainer,
 	if (lpContainer && !lpUnk)

 	{

 		hRes = S_OK;

-		//Log(_T("CallOpenEntry: Calling OpenEntry on Container with ulFlags = 0x%X\n"),ulFlags);

+		//Log(L"CallOpenEntry: Calling OpenEntry on Container with ulFlags = 0x%X\n",ulFlags);

 		(lpContainer->OpenEntry(

 			cbEntryID,

 			lpEntryID,

@@ -341,7 +341,7 @@ HRESULT CallOpenEntry( LPMDB lpMDB, LPADRBOOK lpAB, LPMAPICONTAINER lpContainer,
 	if (lpMAPISession && !lpUnk)

 	{

 		hRes = S_OK;

-		//Log(_T("CallOpenEntry: Calling OpenEntry on Session with ulFlags = 0x%X\n"),ulFlags);

+		//Log(L"CallOpenEntry: Calling OpenEntry on Session with ulFlags = 0x%X\n",ulFlags);

 		(lpMAPISession->OpenEntry(

 			cbEntryID,

 			lpEntryID,

@@ -371,7 +371,7 @@ HRESULT CallOpenEntry( LPMDB lpMDB, LPADRBOOK lpAB, LPMAPICONTAINER lpContainer,
 

 	if (lpUnk)

 	{

-		//Log(_T("OnOpenEntryID: Got object (0x%08X) of type 0x%08X = %s\n"),lpUnk,ulObjType,ObjectTypeToString(ulObjType));

+		//Log(L"OnOpenEntryID: Got object (0x%08X) of type 0x%08X = %s\n",lpUnk,ulObjType,ObjectTypeToString(ulObjType));

 		*lppUnk = lpUnk;		

 	}

 	if (ulObjTypeRet) *ulObjTypeRet = ulObjType;

@@ -449,7 +449,7 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass
 			hr = MAPILogonEx( 0, (LPTSTR)mir_t2a(szPIDandName), (LPTSTR)mir_t2a(m_szPassword), dwFlags, &m_lpMAPISession );

 

 			if (FAILED(hr)) {

-				//Log( _T("MAPI Logon failed: 0x%08X"), hr );

+				//Log( L"MAPI Logon failed: 0x%08X", hr );

 				return hr;

 			}

 			

@@ -490,7 +490,7 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass
 			if (NULL == pDefMsgStore )

 				return hr;

 

-			hRes = pDefMsgStore->GetReceiveFolder( _T("IPM"), NULL, &cbInboxEID,  &lpInboxEID, NULL);

+			hRes = pDefMsgStore->GetReceiveFolder( L"IPM", NULL, &cbInboxEID,  &lpInboxEID, NULL);

 			m_lpMDB = pDefMsgStore;

 			if (cbInboxEID && lpInboxEID) {

 				hRes = CallOpenEntry( pDefMsgStore, NULL, NULL, NULL, cbInboxEID, lpInboxEID, MAPI_BEST_ACCESS, NULL, (LPUNKNOWN*)&m_lpInbox);

@@ -565,7 +565,7 @@ HRESULT CMirandaExchange::CreateProfile( LPTSTR szProfileName )
 	nSize = mir_tstrlen(m_szUsername);

 	szUniqName = (TCHAR*)mir_alloc(sizeof(TCHAR) * (nSize + 4));

 	if (szUniqName != NULL) {

-		memcpy(szUniqName, _T("="), sizeof(TCHAR));

+		memcpy(szUniqName, L"=", sizeof(TCHAR));

 		memcpy((szUniqName + 1), m_szUsername, (sizeof(TCHAR) * (nSize + 1)));

 		// Set values for PR_PROFILE_UNRESOLVED_NAME and PR_PROFILE_UNRESOLVED_SERVER

 		SPropValue spval[2];

@@ -847,7 +847,7 @@ HRESULT CMirandaExchange::OpenTheMessage( LPTSTR )
 	DWORD dwType = REG_SZ;

 

 	if ( RegOpenKeyEx(HKEY_CLASSES_ROOT,

-        _T("mailto\\shell\\open\\command"),

+        L"mailto\\shell\\open\\command",

         0,

         KEY_ALL_ACCESS | KEY_EXECUTE | KEY_QUERY_VALUE ,

         &hTheKey) == ERROR_SUCCESS

@@ -863,12 +863,12 @@ HRESULT CMirandaExchange::OpenTheMessage( LPTSTR )
 		else

 		{

 					

-			TCHAR* szTheEnd = _tcsstr( szRegValue,_T(".EXE") );

+			TCHAR* szTheEnd = _tcsstr( szRegValue,L".EXE" );

 

 			if ( NULL != szTheEnd )

 			{

 				szRegValue[ mir_tstrlen(szRegValue) - mir_tstrlen(szTheEnd) +5 ]  = _T('\0');

-				mir_tstrcat( szRegValue, _T(" /recycle") );

+				mir_tstrcat( szRegValue, L" /recycle" );

 				STARTUPINFO         si;

 				PROCESS_INFORMATION pi;

 				

diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp
index 0839e0a5d2..a134dafa10 100644
--- a/plugins/Exchange/src/dlg_handlers.cpp
+++ b/plugins/Exchange/src/dlg_handlers.cpp
@@ -41,13 +41,13 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
 			int bCheck = db_get_b(NULL, ModuleName, "Check", 1);

 

 			TCHAR buffer[4096];

-			GetStringFromDatabase("Username", _T(""), buffer, _countof(buffer));

+			GetStringFromDatabase("Username", L"", buffer, _countof(buffer));

 			SetDlgItemText(hWnd, IDC_USER_EDIT, buffer);

 

-			GetStringFromDatabase("Password", _T(""), buffer, _countof(buffer));

+			GetStringFromDatabase("Password", L"", buffer, _countof(buffer));

 			SetDlgItemText(hWnd, IDC_PASSWORD_EDIT, buffer);

 

-			GetStringFromDatabase("Server", _T(""), buffer, _countof(buffer));

+			GetStringFromDatabase("Server", L"", buffer, _countof(buffer));

 			SetDlgItemText(hWnd, IDC_SERVER_EDIT, buffer);

 

 			SetDlgItemInt(hWnd, IDC_PORT_EDIT, db_get_dw(NULL, ModuleName, "Port", EXCHANGE_PORT), FALSE);

@@ -226,8 +226,8 @@ INT_PTR CALLBACK DlgProcEmails(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
 			LVITEM item = { 0 };

 			TEmailHeader email = { 0 };

 			email.cbSize = sizeof(TEmailHeader);

-			TCHAR sender[1024] = _T("");

-			TCHAR subject[1024] = _T("");

+			TCHAR sender[1024] = L"";

+			TCHAR subject[1024] = L"";

 			//char buffer[4096];

 			email.cSender = sizeof(sender);

 			email.cSubject = sizeof(subject);

diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp
index a4e80c6c7e..496d8969eb 100644
--- a/plugins/Exchange/src/emails.cpp
+++ b/plugins/Exchange/src/emails.cpp
@@ -61,11 +61,11 @@ int CExchangeServer::Connect(int bForceConnect)
 		TCHAR password[1024]; //i know

 		TCHAR server[1024];

 

-		GetStringFromDatabase("Username", _T(""), user, _countof(user));

+		GetStringFromDatabase("Username", L"", user, _countof(user));

 		_tcsncpy_s(user, VARST(user), _TRUNCATE);

 

-		GetStringFromDatabase("Password", _T(""), password, _countof(password));

-		GetStringFromDatabase("Server", _T(""), server, _countof(server));

+		GetStringFromDatabase("Password", L"", password, _countof(password));

+		GetStringFromDatabase("Server", L"", server, _countof(server));

 

 		int port = db_get_dw(NULL, ModuleName, "Port", EXCHANGE_PORT);

 		if (mir_tstrlen(server) > 0) //only connect if there's a server to connect to

@@ -153,7 +153,7 @@ int CExchangeServer::IsServerAvailable()
 		return 0; //server is not available

 

 	TCHAR szServer[1024];

-	GetStringFromDatabase("Server", _T(""), szServer, sizeof(szServer));

+	GetStringFromDatabase("Server", L"", szServer, sizeof(szServer));

 	sockaddr_in addrServer;

 	InitSocketAddr(&addrServer, mir_t2a(szServer));

 	int res = connect(sServer, (sockaddr *) &addrServer, sizeof(addrServer));

@@ -209,10 +209,10 @@ int CExchangeServer::GetEmailHeader(int iUnreadEmail, TEmailHeader *emailInfo)
 		TCHAR* szSubject = m_HeadersKeeper[iUnreadEmail]->m_szSubject;

 

 		if (NULL == szSender)

-			szSender = _T("");

+			szSender = L"";

 

 		if (NULL == szSubject)

-			szSubject = _T("");

+			szSubject = L"";

 

 		emailInfo->szSender  = szSender;

 		emailInfo->szSubject = szSubject;

diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp
index 97589f181f..c1b297f164 100644
--- a/plugins/Exchange/src/utils.cpp
+++ b/plugins/Exchange/src/utils.cpp
@@ -95,16 +95,16 @@ char *BinToHex(int size, PBYTE data)
 void HexToBin(TCHAR *inData, ULONG &size, LPBYTE &outData)

 {

 	TCHAR buffer[32] = { 0 };

-	_tcsncpy(buffer, _T("0x"), _countof(_T("0x")));

+	_tcsncpy(buffer, L"0x", _countof(L"0x"));

 	_tcsncpy(buffer + 2, inData, HEX_SIZE);

-	_stscanf(buffer, _T("%x"), &size);

+	_stscanf(buffer, L"%x", &size);

 	outData = (unsigned char*)new char[size * 2];

 

 	TCHAR *tmp = inData + HEX_SIZE;

 	buffer[4] = '\0'; //mark the end of the string

 	for (UINT i = 0; i < size; i++) {

 		_tcsncpy(buffer + 2, &tmp[i * 2], 2);

-		_stscanf(buffer, _T("%hhx"), &outData[i]);

+		_stscanf(buffer, L"%hhx", &outData[i]);

 	}

 }

 

@@ -224,7 +224,7 @@ void _popupUtil(TCHAR* szMsg)
 {

 	POPUPDATAT ppd = { 0 };

 	ppd.lchIcon = hiMailIcon;

-	_tcsncpy(ppd.lptzContactName, _T("Exchange notifier"), MAX_CONTACTNAME - 1);

+	_tcsncpy(ppd.lptzContactName, L"Exchange notifier", MAX_CONTACTNAME - 1);

 	_tcsncpy(ppd.lptzText, szMsg, MAX_SECONDLINE - 1);

 	PUAddPopupT(&ppd); //show a popup to tell the user what we're doing.

 }