hello, Unix.

phase 1: removing _T()

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

2 files changed, 14 insertions, 14 deletions

diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp
index 78574ebcd0..83eca17bda 100644
--- a/plugins/QuickMessages/src/main.cpp
+++ b/plugins/QuickMessages/src/main.cpp
@@ -110,7 +110,7 @@ static int InputMenuPopup(WPARAM, LPARAM lParam)
 					SendMessage(mwpd->hwnd, EM_GETSELTEXT, 0, (LPARAM)pszText);

 				}

 				if (qd->ptszValue) {

-					ptszQValue = ParseString(mwpd->hContact, qd->ptszValue, pszText ? pszText : _T(""), pszCBText ? pszCBText : _T(""), (int)mir_tstrlen(qd->ptszValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

+					ptszQValue = ParseString(mwpd->hContact, qd->ptszValue, pszText ? pszText : L"", pszCBText ? pszCBText : L"", (int)mir_tstrlen(qd->ptszValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

 					if ((bIsService = qd->bIsService) && ptszQValue)

 

 						CallService(mir_u2a(ptszQValue), (WPARAM)mwpd->hContact, 0);

@@ -195,7 +195,7 @@ static int CustomButtonPressed(WPARAM, LPARAM lParam)
 	switch (state) {

 	case 1:

 		if (ButtonsList[cbcd->dwButtonId]->ptszQValue)

-			ptszQValue = ParseString(cbcd->hContact, ButtonsList[cbcd->dwButtonId]->ptszQValue, pszText ? pszText : _T(""), pszCBText ? pszCBText : _T(""), (int)mir_tstrlen(ButtonsList[cbcd->dwButtonId]->ptszQValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

+			ptszQValue = ParseString(cbcd->hContact, ButtonsList[cbcd->dwButtonId]->ptszQValue, pszText ? pszText : L"", pszCBText ? pszCBText : L"", (int)mir_tstrlen(ButtonsList[cbcd->dwButtonId]->ptszQValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

 		if ((bIsService = ButtonsList[cbcd->dwButtonId]->bIsServName) && ptszQValue)

 			CallService(mir_u2a(ptszQValue), (WPARAM)cbcd->hContact, 0);

 		break;

@@ -204,7 +204,7 @@ static int CustomButtonPressed(WPARAM, LPARAM lParam)
 		{

 			ButtonData *bd = (ButtonData *)sl->items[0];

 			if (bd && bd->pszValue) {

-				ptszQValue = ParseString(cbcd->hContact, bd->pszValue, pszText ? pszText : _T(""), pszCBText ? pszCBText : _T(""), (int)mir_tstrlen(bd->pszValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

+				ptszQValue = ParseString(cbcd->hContact, bd->pszValue, pszText ? pszText : L"", pszCBText ? pszCBText : L"", (int)mir_tstrlen(bd->pszValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

 				if ((bIsService = bd->bIsServName) && ptszQValue)

 					CallService(mir_u2a(ptszQValue), (WPARAM)cbcd->hContact, 0);

 			}

@@ -246,7 +246,7 @@ static int CustomButtonPressed(WPARAM, LPARAM lParam)
 		ButtonData *bd = (ButtonData *)sl->items[res - 1];

 		bCTRL = (GetKeyState(VK_CONTROL) & 0x8000) ? 1 : 0;

 		if (bd->pszValue) {

-			ptszQValue = ParseString(cbcd->hContact, bd->pszValue, pszText ? pszText : _T(""), pszCBText ? pszCBText : _T(""), (int)mir_tstrlen(bd->pszValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

+			ptszQValue = ParseString(cbcd->hContact, bd->pszValue, pszText ? pszText : L"", pszCBText ? pszCBText : L"", (int)mir_tstrlen(bd->pszValue), textlenght, pszCBText ? (int)mir_tstrlen(pszCBText) : 0);

 			if ((bIsService = bd->bIsServName) && ptszQValue)

 				CallService(mir_u2a(ptszQValue), (WPARAM)cbcd->hContact, 0);

 		}

diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp
index 63570bb4a3..412d57f2cb 100644
--- a/plugins/QuickMessages/src/options.cpp
+++ b/plugins/QuickMessages/src/options.cpp
@@ -750,14 +750,14 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 					hwndEdit = NULL;

 					if (!mir_tstrlen(szLabel)) break;

 					if (bd = (ButtonData*)tvi.lParam) {

-						if (!mir_tstrcmp(szLabel, _T("---"))) {

+						if (!mir_tstrcmp(szLabel, L"---")) {

 							if (TreeView_GetChild(hMenuTree, tvi.hItem))

 								break;

 							else {

 								bd->fEntryOpType = QMF_EX_SEPARATOR;

 								EnableWindow(GetDlgItem(hdlg, IDC_MENUVALUE), FALSE);

 								EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME), FALSE);

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

+								SetDlgItemText(hdlg, IDC_MENUVALUE, L"");

 							}

 						}

 						else {

@@ -839,7 +839,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 							EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME), FALSE);

 							if (!(bd->fEntryOpType&QMF_EX_SEPARATOR))

 								EnableWindow(GetDlgItem(hdlg, IDC_INQMENU), FALSE);

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

+							SetDlgItemText(hdlg, IDC_MENUVALUE, L"");

 						}

 						CheckDlgButton(hdlg, IDC_INQMENU, bd->bOpInQMenu ? BST_CHECKED : BST_UNCHECKED);

 						CheckDlgButton(hdlg, IDC_ISSERVNAME, bd->bIsOpServName ? BST_CHECKED : BST_UNCHECKED);

@@ -899,7 +899,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 						EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME), FALSE);

 						EnableWindow(GetDlgItem(hdlg, IDC_INQMENU), FALSE);

 						EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME2), FALSE);

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

+						SetDlgItemText(hdlg, IDC_MENUVALUE, L"");

 						break;

 					}

 

@@ -912,7 +912,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 

 					BuildMenuTree(hMenuTree, (SortedList *)((ListData*)tvi.lParam)->sl);

 

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

+					SetDlgItemText(hdlg, IDC_MENUVALUE, L"");

 					EnableWindow(GetDlgItem(hdlg, IDC_RCLICKVALUE), TRUE);

 					EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME2), TRUE);

 					CheckDlgButton(hdlg, IDC_ISSERVNAME2, ((ListData*)tvi.lParam)->bIsOpServName ? BST_CHECKED : BST_UNCHECKED);

@@ -920,7 +920,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 					if (((ListData*)tvi.lParam)->ptszOPQValue)

 						SetDlgItemText(hdlg, IDC_RCLICKVALUE, ((ListData*)tvi.lParam)->ptszOPQValue);

 					else

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

+						SetDlgItemText(hdlg, IDC_RCLICKVALUE, L"");

 				}

 				break;

 			}

@@ -992,8 +992,8 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 					EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME), FALSE);

 					EnableWindow(GetDlgItem(hdlg, IDC_INQMENU), FALSE);

 					EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME2), FALSE);

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

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

+					SetDlgItemText(hdlg, IDC_MENUVALUE, L"");

+					SetDlgItemText(hdlg, IDC_RCLICKVALUE, L"");

 				}

 			}break;

 

@@ -1016,7 +1016,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 				bd->dwOPPos = TreeView_GetCount(hMenuTree) - 1;

 				bd->pszOpName = mir_tstrlen(namebuff) ? mir_tstrdup(namebuff) : mir_tstrdup(TranslateT("New Menu Entry"));

 				bd->pszOpValue = mir_tstrdup(bd->pszOpName);

-				bd->fEntryOpType = !mir_tstrcmp(namebuff, _T("---")) ? QMF_EX_SEPARATOR : 0;

+				bd->fEntryOpType = !mir_tstrcmp(namebuff, L"---") ? QMF_EX_SEPARATOR : 0;

 				bd->dwOPFlags = QMF_NEW;

 				bd->pszName = NULL;

 				bd->pszValue = NULL;

@@ -1074,7 +1074,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 					EnableWindow(GetDlgItem(hdlg, IDC_MENUVALUE), FALSE);

 					EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME), FALSE);

 					EnableWindow(GetDlgItem(hdlg, IDC_INQMENU), FALSE);

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

+					SetDlgItemText(hdlg, IDC_MENUVALUE, L"");

 				}

 			}break;

 		}