less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

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

1 files changed, 11 insertions, 11 deletions

diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp
index dd557e25d1..6237ceaa31 100644
--- a/protocols/IRCG/src/userinfo.cpp
+++ b/protocols/IRCG/src/userinfo.cpp
@@ -35,10 +35,10 @@ struct UserDetailsDlgProcParam
 	MCONTACT hContact;

 };

 

-#define STR_BASIC LPGEN("Faster! Searches the network for an exact match of the nickname only. The hostmask is optional and provides further security if used. Wildcards (? and *) are allowed.")

-#define STR_ADVANCED LPGEN("Slower! Searches the network for nicknames matching a wildcard string. The hostmask is mandatory and a minimum of 4 characters is necessary in the \"Nick\" field. Wildcards (? and *) are allowed.")

-#define STR_ERROR LPGEN("Settings could not be saved!\n\nThe \"Nick\" field must contain at least four characters including wildcards,\n and it must also match the default nickname for this contact.")

-#define STR_ERROR2 LPGEN("Settings could not be saved!\n\nA full hostmask must be set for this online detection mode to work.")

+const wchar_t *STR_BASIC = LPGENW("Faster! Searches the network for an exact match of the nickname only. The hostmask is optional and provides further security if used. Wildcards (? and *) are allowed.");

+const wchar_t *STR_ADVANCED = LPGENW("Slower! Searches the network for nicknames matching a wildcard string. The hostmask is mandatory and a minimum of 4 characters is necessary in the \"Nick\" field. Wildcards (? and *) are allowed.");

+const wchar_t *STR_ERROR = LPGENW("Settings could not be saved!\n\nThe \"Nick\" field must contain at least four characters including wildcards,\n and it must also match the default nickname for this contact.");

+const wchar_t *STR_ERROR2 = LPGENW("Settings could not be saved!\n\nA full hostmask must be set for this online detection mode to work.");

 

 INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

@@ -63,14 +63,14 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 			EnableWindow(GetDlgItem(m_hwnd, IDC_WILDCARD), bAdvanced);

 

 			if (!bAdvanced) {

-				SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateT(STR_BASIC));

+				SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateTS(STR_BASIC));

 				if (!p->ppro->getTString(p->hContact, "Default", &dbv)) {

 					SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);

 					db_free(&dbv);

 				}

 			}

 			else {

-				SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateT(STR_ADVANCED));

+				SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateTS(STR_ADVANCED));

 				if (!p->ppro->getTString(p->hContact, "UWildcard", &dbv)) {

 					SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);

 					db_free(&dbv);

@@ -99,7 +99,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 		EnableWindow(GetDlgItem(m_hwnd, IDC_BUTTON2), true);

 

 		if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDC_BUTTON) {

-			TCHAR temp[500];

+			wchar_t temp[500];

 			GetDlgItemText(m_hwnd, IDC_WILDCARD, temp, _countof(temp));

 

 			BYTE bAdvanced = IsDlgButtonChecked(m_hwnd, IDC_RADIO1) ? 0 : 1;

@@ -107,13 +107,13 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 				if (GetWindowTextLength(GetDlgItem(m_hwnd, IDC_WILDCARD)) == 0 ||

 					GetWindowTextLength(GetDlgItem(m_hwnd, IDC_USER)) == 0 ||

 					GetWindowTextLength(GetDlgItem(m_hwnd, IDC_HOST)) == 0) {

-					MessageBox(NULL, TranslateT(STR_ERROR2), TranslateT("IRC error"), MB_OK | MB_ICONERROR);

+					MessageBox(NULL, TranslateTS(STR_ERROR2), TranslateT("IRC error"), MB_OK | MB_ICONERROR);

 					return FALSE;

 				}

 

 				DBVARIANT dbv;

 				if (!p->ppro->getTString(p->hContact, "Default", &dbv)) {

-					CMString S = _T(STR_ERROR);

+					CMString S = STR_ERROR;

 					S += L" (";

 					S += dbv.ptszVal;

 					S += L")";

@@ -162,7 +162,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 		}

 

 		if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDC_RADIO1) {

-			SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateT(STR_BASIC));

+			SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateTS(STR_BASIC));

 

 			DBVARIANT dbv;

 			if (!p->ppro->getTString(p->hContact, "Default", &dbv)) {

@@ -174,7 +174,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 

 		if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDC_RADIO2) {

 			DBVARIANT dbv;

-			SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateT(STR_ADVANCED));

+			SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateTS(STR_ADVANCED));

 			if (!p->ppro->getTString(p->hContact, "UWildcard", &dbv)) {

 				SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);

 				db_free(&dbv);