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, 29 insertions, 29 deletions

diff --git a/plugins/WhoUsesMyFiles/src/list.cpp b/plugins/WhoUsesMyFiles/src/list.cpp
index b02d918ef1..2a1c189c9b 100644
--- a/plugins/WhoUsesMyFiles/src/list.cpp
+++ b/plugins/WhoUsesMyFiles/src/list.cpp
@@ -19,12 +19,12 @@ PWumf new_wumf( DWORD dwID,
 	w->szUNC  = mir_tstrdup(szUNC);

 

 	switch(dwPerm) {

-		case PERM_FILE_READ: mir_tstrcpy(w->szPerm, _T("Read"));break;

-		case PERM_FILE_WRITE: mir_tstrcpy(w->szPerm, _T("Write"));break;

-		case PERM_FILE_CREATE: mir_tstrcpy(w->szPerm, _T("Create"));break;

-		default: mir_tstrcpy(w->szPerm, _T("Execute"));

+		case PERM_FILE_READ: mir_tstrcpy(w->szPerm, L"Read");break;

+		case PERM_FILE_WRITE: mir_tstrcpy(w->szPerm, L"Write");break;

+		case PERM_FILE_CREATE: mir_tstrcpy(w->szPerm, L"Create");break;

+		default: mir_tstrcpy(w->szPerm, L"Execute");

 	}

-	mir_sntprintf(w->szID, _T("%i"), dwID);

+	mir_sntprintf(w->szID, L"%i", dwID);

 

 	w->dwID = dwID;

 	w->dwSess = dwSess;

diff --git a/plugins/WhoUsesMyFiles/src/stdafx.h b/plugins/WhoUsesMyFiles/src/stdafx.h
index a8b3772cc5..1369af3336 100644
--- a/plugins/WhoUsesMyFiles/src/stdafx.h
+++ b/plugins/WhoUsesMyFiles/src/stdafx.h
@@ -127,6 +127,6 @@ void process_session(SESSION_INFO_1 s_info);
 void process_file(SESSION_INFO_1 s_info, FILE_INFO_3 f_info);

 void printError(DWORD res);

 

-#define msg(X) MessageBox(NULL, X, _T("WUMF"), MB_OK|MB_ICONSTOP)

+#define msg(X) MessageBox(NULL, X, L"WUMF", MB_OK|MB_ICONSTOP)

 #define MS_WUMF_SWITCHPOPUP 	"WUMF/SwitchPopup"

 #define MS_WUMF_CONNECTIONSSHOW "WUMF/ShowConnections"

diff --git a/plugins/WhoUsesMyFiles/src/wumf.cpp b/plugins/WhoUsesMyFiles/src/wumf.cpp
index 17e89fbc6b..730fbc152f 100644
--- a/plugins/WhoUsesMyFiles/src/wumf.cpp
+++ b/plugins/WhoUsesMyFiles/src/wumf.cpp
@@ -72,7 +72,7 @@ INT_PTR CALLBACK ConnDlgProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 			lvc.mask = LVCF_TEXT|LVCF_FMT|LVCF_WIDTH;

 			lvc.fmt = LVCFMT_LEFT;

 			lvc.cx = 40;

-			lvc.pszText = _T("ID");

+			lvc.pszText = L"ID";

 			ListView_InsertColumn(hList, 0, &lvc);

 			lvc.cx = 50;

 			lvc.pszText = TranslateT("User");

@@ -88,7 +88,7 @@ INT_PTR CALLBACK ConnDlgProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 			if (IsUserAnAdmin())

 				SetTimer(NULL, 777, TIME, TimerProc);

 			else

-				MessageBox(NULL, TranslateT("Plugin WhoUsesMyFiles requires admin privileges in order to work."), _T("Miranda NG"), MB_OK);

+				MessageBox(NULL, TranslateT("Plugin WhoUsesMyFiles requires admin privileges in order to work."), L"Miranda NG", MB_OK);

 			ShowList(lst, hList);

 		}

 		Utils_RestoreWindowPosition(hWnd, NULL, MODULENAME,"conn");

@@ -137,10 +137,10 @@ void LogWumf(PWumf w)
 	if (!WumfOptions.LogFolders && (w->dwAttr & FILE_ATTRIBUTE_DIRECTORY)) return;

 

 	if (hLogger == NULL) {

-		hLogger = mir_createLog("wumf", _T("WhoIsUsingMyFiles log file"), WumfOptions.LogFile, 0);

+		hLogger = mir_createLog("wumf", L"WhoIsUsingMyFiles log file", WumfOptions.LogFile, 0);

 		if (hLogger == NULL) {

 			TCHAR str[256];

-			mir_sntprintf(str, _T("Can't open log file %s"), WumfOptions.LogFile);

+			mir_sntprintf(str, L"Can't open log file %s", WumfOptions.LogFile);

 			MessageBox(NULL, str, TranslateT("Error opening file"), MB_OK | MB_ICONSTOP);

 			WumfOptions.LogToFile = FALSE;

 			return;

@@ -153,7 +153,7 @@ void LogWumf(PWumf w)
 	TCHAR lpDateStr[20], lpTimeStr[20];

 	GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, lpDateStr, 20);

 	GetTimeFormat(LOCALE_USER_DEFAULT, TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER, &time, NULL, lpTimeStr, 20);

-	mir_writeLogT(hLogger, _T("%s %s %20s\t%s\r\n"), lpDateStr, lpTimeStr, w->szUser, w->szPath);

+	mir_writeLogT(hLogger, L"%s %s %20s\t%s\r\n", lpDateStr, lpTimeStr, w->szUser, w->szPath);

 }

 

 BOOL wumf()

diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
index 541ce7dfa6..5d9bfde86d 100644
--- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
@@ -68,11 +68,11 @@ void ExecuteMenu(HWND hWnd)
         msg(TranslateT("Error creating menu"));

         return;

     }

-    AppendMenu(hMenu, MF_STRING, IDM_ABOUT, _T("About\0"));

+    AppendMenu(hMenu, MF_STRING, IDM_ABOUT, L"About\0");

     AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);//------------------

-    AppendMenu(hMenu, MF_STRING, IDM_SHOW, _T("Show connections\0"));

+    AppendMenu(hMenu, MF_STRING, IDM_SHOW, L"Show connections\0");

     AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);//------------------

-    AppendMenu(hMenu, MF_STRING, IDM_EXIT, _T("Dismiss popup\0"));

+    AppendMenu(hMenu, MF_STRING, IDM_EXIT, L"Dismiss popup\0");

 

     POINT point;

     GetCursorPos(&point);

@@ -119,8 +119,8 @@ void ShowWumfPopup(PWumf w)
 	TCHAR text[512], title[512];

 

 	if (!WumfOptions.AlertFolders && (w->dwAttr & FILE_ATTRIBUTE_DIRECTORY)) return;

-	mir_sntprintf(title, _T("%s (%s)"), w->szComp, w->szUser);

-	mir_sntprintf(text, _T("%s (%s)"), w->szPath, w->szPerm);

+	mir_sntprintf(title, L"%s (%s)", w->szComp, w->szUser);

+	mir_sntprintf(text, L"%s (%s)", w->szPath, w->szPerm);

 	ShowThePopup(w, title, text);

 }

 

@@ -161,28 +161,28 @@ void ShowThePreview()
 	}

 

 	if (WumfOptions.AlertFolders) {

-		ShowThePopup(NULL, _T("Guest"), _T("C:\\My Share"));

+		ShowThePopup(NULL, L"Guest", L"C:\\My Share");

 		Sleep(300);

-		ShowThePopup(NULL, _T("Guest"), _T("C:\\My Share\\Photos"));

+		ShowThePopup(NULL, L"Guest", L"C:\\My Share\\Photos");

 		Sleep(300);

 	}

-	ShowThePopup(NULL, _T("Guest"), _T("C:\\Share\\My Photos\\photo.jpg"));

+	ShowThePopup(NULL, L"Guest", L"C:\\Share\\My Photos\\photo.jpg");

 	Sleep(300);

 	if (WumfOptions.AlertFolders) {

-		ShowThePopup(NULL, _T("User"), _T("C:\\My Share"));

+		ShowThePopup(NULL, L"User", L"C:\\My Share");

 		Sleep(300);

-		ShowThePopup(NULL, _T("User"), _T("C:\\My Share\\Movies"));

+		ShowThePopup(NULL, L"User", L"C:\\My Share\\Movies");

 		Sleep(300);

 	}

-	ShowThePopup(NULL, _T("User"), _T("C:\\My Share\\Movies\\The Two Towers.avi"));

+	ShowThePopup(NULL, L"User", L"C:\\My Share\\Movies\\The Two Towers.avi");

 	Sleep(300);

 	if (WumfOptions.AlertFolders) {

-		ShowThePopup(NULL, _T("Administrator"), _T("C:\\Distributives"));

+		ShowThePopup(NULL, L"Administrator", L"C:\\Distributives");

 		Sleep(300);

-		ShowThePopup(NULL, _T("Administrator"), _T("C:\\Distributives\\Win2k"));

+		ShowThePopup(NULL, L"Administrator", L"C:\\Distributives\\Win2k");

 		Sleep(300);

 	}

-	ShowThePopup(NULL, _T("Administrator"), _T("C:\\Distributives\\Win2k\\setup.exe"));

+	ShowThePopup(NULL, L"Administrator", L"C:\\Distributives\\Win2k\\setup.exe");

 }

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

@@ -260,7 +260,7 @@ void ChooseFile(HWND hwndDlg)
 	ofn.hwndOwner = hwndDlg;

 	ofn.lpstrFile = szFile;

 	ofn.nMaxFile = _countof(szFile);

-	ofn.lpstrFilter = _T("All files (*.*)\0*.*\0Text files (*.txt)\0*.txt\0Log files (*.log)\0*.log\0\0");

+	ofn.lpstrFilter = L"All files (*.*)\0*.*\0Text files (*.txt)\0*.txt\0Log files (*.log)\0*.log\0\0";

 	ofn.nFilterIndex = 2;

 	ofn.Flags = OFN_CREATEPROMPT;

 	// Display the Open dialog box. 

@@ -323,7 +323,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara
 			CheckDlgButton(hwndDlg,IDC_LOG_INTO_FILE,BST_UNCHECKED);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_FILE), FALSE);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SEL_FILE), FALSE);

-			SetDlgItemText(hwndDlg, IDC_FILE, _T(""));

+			SetDlgItemText(hwndDlg, IDC_FILE, L"");

 		}

 		break;

 

@@ -358,7 +358,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wparam,LPARAM lpara
 			case IDC_ALERT_COMP:

 			case IDC_LOG_UNC:

 			case IDC_ALERT_UNC:

-				MessageBox(NULL, TranslateT("Not implemented yet..."), _T("WUMF"), MB_OK | MB_ICONINFORMATION);

+				MessageBox(NULL, TranslateT("Not implemented yet..."), L"WUMF", MB_OK | MB_ICONINFORMATION);

 				break;

 				/* end */

 			case IDC_LOG_INTO_FILE:

@@ -516,7 +516,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	if (IsUserAnAdmin())

 		SetTimer(NULL, 777, TIME, TimerProc);

 	else

-		MessageBox(NULL, TranslateT("Plugin WhoUsesMyFiles requires admin privileges in order to work."), _T("Miranda NG"), MB_OK);

+		MessageBox(NULL, TranslateT("Plugin WhoUsesMyFiles requires admin privileges in order to work."), L"Miranda NG", MB_OK);

 	return 0;

 }