hello, Unix.

phase 1: removing _T()

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

5 files changed, 39 insertions, 39 deletions

diff --git a/plugins/NotesAndReminders/src/hotkeys.cpp b/plugins/NotesAndReminders/src/hotkeys.cpp
index 8038037792..052e8d4dfd 100644
--- a/plugins/NotesAndReminders/src/hotkeys.cpp
+++ b/plugins/NotesAndReminders/src/hotkeys.cpp
@@ -1,6 +1,6 @@
 #include "globals.h"

 

-#define MSG_WND_CLASS _T("MIM_SNMsgWindow")

+#define MSG_WND_CLASS "MIM_SNMsgWindow"

 

 

 HWND HKHwnd;

@@ -105,7 +105,7 @@ void CreateMsgWindow(void)
 	HWND hParent = NULL;

 	WNDCLASSEX TWC = {0};

 

-	if (!GetClassInfoEx(hmiranda,MSG_WND_CLASS,&TWC))

+	if (!GetClassInfoEx(hmiranda, MSG_WND_CLASS, &TWC))

 	{

 		TWC.style = 0;

 		TWC.cbClsExtra = 0;

@@ -123,7 +123,7 @@ void CreateMsgWindow(void)
 

 	hParent = HWND_MESSAGE;

 

-	HKHwnd = CreateWindowEx(WS_EX_TOOLWINDOW, MSG_WND_CLASS, _T("StickyNotes"), 0, 0, 0, 0, 0, hParent, NULL, hmiranda, NULL);

+	HKHwnd = CreateWindowEx(WS_EX_TOOLWINDOW, MSG_WND_CLASS, "StickyNotes", 0, 0, 0, 0, 0, hParent, NULL, hmiranda, NULL);

 	SetTimer(HKHwnd, 1026, REMINDER_UPDATE_INTERVAL, 0);

 }

 

diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 67b3a00901..30ee8282a4 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -308,7 +308,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	ctrls.dwICC = ICC_DATE_CLASSES;

 	InitCommonControlsEx(&ctrls);

 

-	hRichedDll = LoadLibrary(_T("Msftedit.dll"));

+	hRichedDll = LoadLibrary("Msftedit.dll");

 	if (!hRichedDll) {

 		if (MessageBox(0, TranslateT("Miranda could not load the Notes & Reminders plugin, Msftedit.dll is missing. If you are using WINE, please make sure you have Msftedit.dll installed. Press 'Yes' to continue loading Miranda."), _T(SECTIONNAME), MB_YESNO | MB_ICONINFORMATION) != IDYES)

 			return 1;

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index 06e3c87cc0..8b752336ed 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -46,7 +46,7 @@
 
 #define PENLINK ENLINK *
 
-#define NOTE_WND_CLASS _T("MIM_StickyNote")
+#define NOTE_WND_CLASS "MIM_StickyNote"
 
 
 #define IDM_COLORPRESET_BG 41000
@@ -311,7 +311,7 @@ STICKYNOTE* NewNoteEx(int Ax,int Ay,int Aw,int Ah,char *Data,ULARGE_INTEGER *ID,
 	// NOTE: loaded note positions stem from GetWindowPlacement, which normally have a different coord space than
 	//       CreateWindow/SetWindowPos, BUT since we now use WS_EX_TOOLWINDOW they use the same coord space so
 	//       we don't have to worry about notes "drifting" between sessions
-	TSN->SNHwnd = CreateWindowEx(L1, NOTE_WND_CLASS, _T("StickyNote"), L2, Ax,Ay,Aw,Ah, NULL, 0, hmiranda, TSN);
+	TSN->SNHwnd = CreateWindowEx(L1, NOTE_WND_CLASS, "StickyNote", L2, Ax,Ay,Aw,Ah, NULL, 0, hmiranda, TSN);
 
 	if (g_Transparency < 255)
 		SetLayeredWindowAttributes(TSN->SNHwnd,0,(BYTE)g_Transparency,LWA_ALPHA);
@@ -1002,10 +1002,10 @@ static int FindMenuItem(HMENU h, LPTSTR lpszName)
 static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
 {
 	int n, i;
-	STICKYNOTE *SN = (STICKYNOTE*)GetProp(AhWnd, _T("ctrldata"));
+	STICKYNOTE *SN = (STICKYNOTE*)GetProp(AhWnd, "ctrldata");
 
 	HMENU hMenuLoad, FhMenu, hSub;
-	hMenuLoad = LoadMenu(hinstance, _T("MNU_NOTEPOPUP"));
+	hMenuLoad = LoadMenu(hinstance, "MNU_NOTEPOPUP");
 	FhMenu = GetSubMenu(hMenuLoad,0);
 
 	if (SN->OnTop)
@@ -1018,11 +1018,11 @@ static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
 
 	// NOTE: names used for FindMenuItem would need to include & chars if such shortcuts are added to the menus
 
-	n = FindMenuItem(FhMenu, _T("Appearance"));
+	n = FindMenuItem(FhMenu, "Appearance");
 	if (n >= 0 && (hSub = GetSubMenu(FhMenu, n)))
 	{
-		HMENU hBg = GetSubMenu(hSub, FindMenuItem(hSub, _T("Background Color")));
-		HMENU hFg = GetSubMenu(hSub, FindMenuItem(hSub, _T("Text Color")));
+		HMENU hBg = GetSubMenu(hSub, FindMenuItem(hSub, "Background Color"));
+		HMENU hFg = GetSubMenu(hSub, FindMenuItem(hSub, "Text Color"));
 
 		for (i=0; i<_countof(clrPresets); i++)
 			InsertMenu(hBg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_BG+i, TranslateTS(clrPresets[i].szName));
@@ -1189,7 +1189,7 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
     case WM_TIMER:
 		if (wParam == 1025)
 		{
-			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,_T("ctrldata"));
+			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg, "ctrldata");
 
 			KillTimer(hdlg, 1025);
 			JustSaveNotesEx(SN);
@@ -1203,14 +1203,14 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 		}
     case WM_CREATE:
 		{
-			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,_T("ctrldata"));
+			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg, "ctrldata");
 
 			CREATESTRUCT *CS = (CREATESTRUCT *)lParam;
 			HWND H;
 			DWORD mystyle;
 
 			SN = (STICKYNOTE*)CS->lpCreateParams;
-			SetProp(hdlg,_T("ctrldata"),(HANDLE)SN);
+			SetProp(hdlg, "ctrldata", (HANDLE)SN);
 			BringWindowToTop(hdlg);
 			mystyle = WS_CHILD | WS_VISIBLE | ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN;
 			if (g_ShowScrollbar) mystyle |= WS_VSCROLL;
@@ -1342,11 +1342,11 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 				Buff = (char*)malloc(PEnLnk->chrg.cpMax - PEnLnk->chrg.cpMin + 1);
 				SendDlgItemMessage(hdlg,1,EM_GETSELTEXT,0,(LPARAM)Buff);
 				if ((GetAsyncKeyState(VK_CONTROL) >> 15) != 0)
-					ShellExecute(hdlg, _T("open"), _T("iexplore"), Buff, _T("") ,SW_SHOWNORMAL);
+					ShellExecute(hdlg,  "open", "iexplore", Buff, "" ,SW_SHOWNORMAL);
 				else if (g_lpszAltBrowser && *g_lpszAltBrowser)
-					ShellExecute(hdlg,_T("open"), g_lpszAltBrowser, Buff, _T("") ,SW_SHOWNORMAL);
+					ShellExecute(hdlg, "open", g_lpszAltBrowser, Buff, "" ,SW_SHOWNORMAL);
 				else
-					ShellExecute(hdlg, _T("open"), Buff, _T(""), _T(""), SW_SHOWNORMAL);
+					ShellExecute(hdlg, "open", Buff, "", "", SW_SHOWNORMAL);
 				SAFE_FREE((void**)&Buff);
 				return TRUE;
 			}
@@ -1438,7 +1438,7 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 		break;
 	case WM_COMMAND:
 		{
-			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg, _T("ctrldata"));
+			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg, "ctrldata");
 
 			HWND H;
 			UINT id;
@@ -1673,12 +1673,12 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l
 			return TRUE;
 		}
 	case WM_NCDESTROY:
-		{
-			RemoveProp(hdlg, _T("ctrldata"));
-		}
+		RemoveProp(hdlg, "ctrldata");
 		break;
-    case WM_CONTEXTMENU:
-		if (DoContextMenu(hdlg,wParam,lParam)) return FALSE;
+
+	case WM_CONTEXTMENU:
+		if (DoContextMenu(hdlg,wParam,lParam))
+			return FALSE;
 
 	default:
 		return DefWindowProc(hdlg,message,wParam,lParam);
@@ -1927,7 +1927,7 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 
 			TranslateDialogDefault(Dialog);
 
-			SetDlgItemText(Dialog,IDC_REMINDERDATA, _T(""));
+			SetDlgItemText(Dialog, IDC_REMINDERDATA, "");
 
 			HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);
 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index fe5590f7a3..d8c013fa40 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -81,11 +81,11 @@ struct FontOptionsList
 }

 static fontOptionsList[] =

 {

-	{LPGENT("Sticky Note Caption"), RGB(0,0,0), _T("Small Fonts"), 0, 7, LPGENT("Sticky Note Background Color")},

-	//{LPGENT("Sticky Note Caption"), RGB(0,0,0), _T("Terminal"), 0, 6, LPGENT("Sticky Note Background Color")},

-	//{LPGENT("Sticky Note Caption"), RGB(0,0,0), _T("MS Serif"), 0, 7, LPGENT("Sticky Note Background Color")},

-	//{LPGENT("Sticky Note Body"), RGB(0,0,0), _T("Tahoma"), 0, 8, LPGENT("Sticky Note Background Color")},

-	{LPGENT("Sticky Note Body"), RGB(0,0,0), _T("System"), DBFONTF_BOLD, 10, LPGENT("Sticky Note Background Color")},

+	{LPGENT("Sticky Note Caption"), RGB(0,0,0), "Small Fonts", 0, 7, LPGENT("Sticky Note Background Color")},

+	//{LPGENT("Sticky Note Caption"), RGB(0,0,0), L"Terminal", 0, 6, LPGENT("Sticky Note Background Color")},

+	//{LPGENT("Sticky Note Caption"), RGB(0,0,0), L"MS Serif", 0, 7, LPGENT("Sticky Note Background Color")},

+	//{LPGENT("Sticky Note Body"), RGB(0,0,0), L"Tahoma", 0, 8, LPGENT("Sticky Note Background Color")},

+	{LPGENT("Sticky Note Body"), RGB(0,0,0), "System", DBFONTF_BOLD, 10, LPGENT("Sticky Note Background Color")},

 };

 

 

@@ -375,7 +375,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 			else 

 				SetDlgItemText(hdlg,IDC_EDIT_EMAILSMS,"");

 

-			SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,g_lpszAltBrowser ? g_lpszAltBrowser : _T(""));

+			SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,g_lpszAltBrowser ? g_lpszAltBrowser : "");

 			return TRUE;

 		}

 	case WM_HSCROLL:

@@ -433,7 +433,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 				mir_free(g_lpszAltBrowser);

 				g_lpszAltBrowser = NULL;

 			}

-			SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,g_lpszAltBrowser ? g_lpszAltBrowser : _T(""));

+			SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,g_lpszAltBrowser ? g_lpszAltBrowser : "");

 			if (g_lpszAltBrowser)

 				db_set_s(0,MODULENAME,"AltBrowser",g_lpszAltBrowser);

 			else

@@ -469,7 +469,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 				ofn.lpstrFile = s;

 				ofn.nMaxFile = _countof(s);

 				ofn.lpstrTitle = TranslateT("Select Executable");

-				ofn.lpstrInitialDir = _T(".");

+				ofn.lpstrInitialDir = ".";

 				ofn.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_ENABLESIZING | OFN_DONTADDTORECENT;

 

 				GetDlgItemText(hdlg, IDC_EDIT_ALTBROWSER, s, ofn.nMaxFile);

@@ -484,13 +484,13 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 		case IDC_BUTTON_RESET:

 			{

 				SAFE_FREE((void**)&g_RemindSMS);

-				SetDlgItemText(hdlg,IDC_EDIT_EMAILSMS,_T(""));

+				SetDlgItemText(hdlg, IDC_EDIT_EMAILSMS, "");

 				if (g_lpszAltBrowser)

 				{

 					mir_free(g_lpszAltBrowser);

 					g_lpszAltBrowser = NULL;

 				}

-				SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,_T(""));

+				SetDlgItemText(hdlg, IDC_EDIT_ALTBROWSER, "");

 				g_ShowNotesAtStart = TRUE;

 				g_AddContListMI = TRUE;

 				g_ShowScrollbar = TRUE;

diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index ffea8e7052..f0a141fd44 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -2326,7 +2326,7 @@ static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDAT
 {

 	HWND hwndListView = (HWND)wParam;

 	if (hwndListView != GetDlgItem(AhWnd, IDC_LISTREMINDERS)) return FALSE;

-	HMENU hMenuLoad = LoadMenu(hinstance, _T("MNU_REMINDERPOPUP"));

+	HMENU hMenuLoad = LoadMenu(hinstance, "MNU_REMINDERPOPUP");

 	HMENU FhMenu = GetSubMenu(hMenuLoad, 0);

 

 	MENUITEMINFO mii = { 0 };

@@ -2373,7 +2373,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA
 		return 0;

 	case WM_RELOAD:

 		{

-			SetDlgItemText(Dialog, IDC_REMINDERDATA, _T(""));

+			SetDlgItemText(Dialog, IDC_REMINDERDATA, "");

 			InitListView(GetDlgItem(Dialog, IDC_LISTREMINDERS));

 			return TRUE;

 		}

@@ -2401,7 +2401,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA
 			Window_SetIcon_IcoLib(Dialog, iconList[6].hIcolib);

 

 			TranslateDialogDefault(Dialog);

-			SetDlgItemText(Dialog,IDC_REMINDERDATA, _T(""));

+			SetDlgItemText(Dialog,IDC_REMINDERDATA, "");

 			HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 			S = Translate("Reminder text");

@@ -2512,7 +2512,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA
 			case IDM_DELETEALLREMINDERS:

 				if (RemindersList && MessageBox(Dialog, TranslateT("Are you sure you want to delete all reminders?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK)

 				{

-					SetDlgItemText(Dialog, IDC_REMINDERDATA, _T(""));

+					SetDlgItemText(Dialog, IDC_REMINDERDATA, "");

 					DeleteReminders();

 					InitListView(GetDlgItem(Dialog,IDC_LISTREMINDERS));

 				}

@@ -2528,7 +2528,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA
 						if (I != -1

 							&& MessageBox(Dialog, TranslateT("Are you sure you want to delete this reminder?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK)

 						{

-							SetDlgItemText(Dialog, IDC_REMINDERDATA, _T(""));

+							SetDlgItemText(Dialog, IDC_REMINDERDATA, "");

 							DeleteReminder((REMINDERDATA*)TreeGetAt(RemindersList, I));

 							JustSaveReminders();

 							InitListView(H);