<tchar.h> removed from <m_system.h>

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

2 files changed, 13 insertions, 13 deletions

diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp
index 7f20587abc..550c9143e6 100644
--- a/plugins/Spamotron/src/options.cpp
+++ b/plugins/Spamotron/src/options.cpp
@@ -5,7 +5,7 @@ wchar_t currentResponse[256] = {0};
 wchar_t* _getCOptS(wchar_t *buf, unsigned int buflen, MCONTACT hContact, const char* option, const wchar_t *def)

 {

 	DBVARIANT dbv = {0};

-	_tcsnset(buf, 0, buflen);

+	wcsnset(buf, 0, buflen);

 	if (db_get_ts(hContact, PLUGIN_NAME, option, &dbv) != 0)

 		wcsncpy(buf, def, min(buflen, mir_tstrlen(def)+1));

 	else if (dbv.type == DBVT_TCHAR) {

@@ -18,7 +18,7 @@ wchar_t* _getMOptS(wchar_t *buf, unsigned int buflen, const char* module, const
 {

 	wchar_t* tmp;

 	DBVARIANT dbv = {0};

-	_tcsnset(buf, 0, buflen);

+	wcsnset(buf, 0, buflen);

 	if (db_get_s(NULL, module, option, &dbv) != 0)

 		wcsncpy(buf, def, min(buflen, mir_tstrlen(def)+1));

 	else if (dbv.type == DBVT_TCHAR) {

@@ -83,7 +83,7 @@ BOOL _saveDlgItemScore(HWND hDialog, int controlID, char* option)
 	len = GetWindowTextLength(GetDlgItem(hDialog, controlID));

 	tmp = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));

 	GetDlgItemText(hDialog, controlID, tmp, len + 1);

-	_setOptD(option, _tcstod(tmp, NULL)/SCORE_C);

+	_setOptD(option, wcstod(tmp, NULL)/SCORE_C);

 	return TRUE;

 }

 

@@ -556,21 +556,21 @@ int OnOptInitialize(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

-	odp.pwszGroup = LPGENW("Message sessions");

-	odp.pwszTitle = _T(PLUGIN_NAME);

-	odp.flags = ODPF_TCHAR | ODPF_BOLDGROUPS;

+	odp.pszGroup = LPGEN("Message sessions");

+	odp.pszTitle = PLUGIN_NAME;

+	odp.flags = ODPF_BOLDGROUPS;

 

-	odp.pwszTab = LPGENW("Settings");

+	odp.pszTab = LPGEN("Settings");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_MAIN);

 	odp.pfnDlgProc = DlgProcOptionsMain;

 	Options_AddPage(wParam, &odp);

 

-	odp.pwszTab = LPGENW("Messages");

+	odp.pszTab = LPGEN("Messages");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_Q);

 	odp.pfnDlgProc = DlgProcOptionsQuestion;

 	Options_AddPage(wParam, &odp);

 

-	odp.pwszTab = LPGENW("Bayes");

+	odp.pszTab = LPGEN("Bayes");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_BAYES);

 	odp.pfnDlgProc = DlgProcOptionsBayes;

 	Options_AddPage(wParam, &odp);

@@ -578,8 +578,8 @@ int OnOptInitialize(WPARAM wParam, LPARAM)
 	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_POPUPS);

 		odp.pfnDlgProc = DlgProcOptionsPopups;

-		odp.pwszGroup = LPGENW("Popups");

-		odp.pwszTab = NULL;

+		odp.pszGroup = LPGEN("Popups");

+		odp.pszTab = NULL;

 		Options_AddPage(wParam, &odp);

 	}

 	return 0;

diff --git a/plugins/Spamotron/src/popups.cpp b/plugins/Spamotron/src/popups.cpp
index 0d81268d04..27bc8f392b 100644
--- a/plugins/Spamotron/src/popups.cpp
+++ b/plugins/Spamotron/src/popups.cpp
@@ -185,7 +185,7 @@ int ShowPopupPreview(HWND optDlg, BYTE popupType, wchar_t *line1, wchar_t *line2
 		ppdp.iSeconds = 0;

 

 	ppdp.lchContact = NULL;

-	wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _T(PLUGIN_NAME)), _TRUNCATE);

+	wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _A2W(PLUGIN_NAME)), _TRUNCATE);

 	if (line2)

 		wcsncpy_s(ppdp.lptzText, line2, _TRUNCATE);

 	return PUAddPopupT(&ppdp);

@@ -234,7 +234,7 @@ int ShowPopup(MCONTACT hContact, BYTE popupType, wchar_t *line1, wchar_t *line2)
 		ppdp.iSeconds = 0;

 

 	ppdp.lchContact = hContact;

-	wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _T(PLUGIN_NAME)), _TRUNCATE);

+	wcsncpy_s(ppdp.lptzContactName, (line1 ? line1 : _A2W(PLUGIN_NAME)), _TRUNCATE);

 	if (line2)

 		wcsncpy_s(ppdp.lptzText, line2, _TRUNCATE);

 	return PUAddPopupT(&ppdp);