popup code cleaning (cause we have no tchar.h)

3 files changed, 17 insertions, 17 deletions

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index 9f65d3e435..2a9f371377 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -299,7 +299,7 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	g_plugin.addOptions(wParam, &odp);

 

 	// if popup service exists

-	if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {

+	if ((ServiceExists(MS_POPUP_ADDPOPUPW))) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

 		odp.szGroup.a = LPGEN("Popups");

 		odp.pfnDlgProc = DlgPopUpOpts;

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index d7f52a6cab..0c8e36cceb 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -111,21 +111,21 @@ int WAlertOSD(MCONTACT hContact, wchar_t *displaytext)
 /*****************************************************************************/

 int PopupAlert(WPARAM hContact, LPARAM lParam)

 {

-	POPUPDATAT ppd = { 0 };

+	POPUPDATAW ppd = { 0 };

 

 	if (hContact != 0)

-		mir_wstrncpy(ppd.lptzContactName, ptrW(g_plugin.getWStringA(hContact, PRESERVE_NAME_KEY)), _countof(ppd.lptzContactName));

+		mir_wstrncpy(ppd.lpwzContactName, ptrW(g_plugin.getWStringA(hContact, PRESERVE_NAME_KEY)), _countof(ppd.lpwzContactName));

 	else

-		mir_wstrcpy(ppd.lptzContactName, _A2W(MODULENAME));

+		mir_wstrcpy(ppd.lpwzContactName, _A2W(MODULENAME));

 

 	ppd.lchContact = hContact;

 	ppd.lchIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_SITE));

 

 	wchar_t *displaytext = (wchar_t*)lParam;

 	if ((mir_wstrlen(displaytext) == MAX_SECONDLINE) || (mir_wstrlen(displaytext) > MAX_SECONDLINE))

-		mir_snwprintf(ppd.lptzText, displaytext);

+		mir_snwprintf(ppd.lpwzText, displaytext);

 	else if (mir_wstrlen(displaytext) < MAX_SECONDLINE)

-		mir_snwprintf(ppd.lptzText, displaytext);

+		mir_snwprintf(ppd.lpwzText, displaytext);

 

 	if (g_plugin.getByte(POP_USECUSTCLRS_KEY, 0)) {

 		ppd.colorBack = g_plugin.getDword(POP_BG_CLR_KEY, Def_color_bg);

@@ -143,8 +143,8 @@ int PopupAlert(WPARAM hContact, LPARAM lParam)
 	ppd.PluginWindowProc = nullptr;

 	ppd.iSeconds = g_plugin.getDword(POP_DELAY_KEY, 0);

 

-	if (ServiceExists(MS_POPUP_ADDPOPUPT))

-		CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0);

+	if (ServiceExists(MS_POPUP_ADDPOPUPW))

+		CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&ppd, 0);

 

 	return 0;

 }

@@ -184,9 +184,9 @@ int ErrorMsgs(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	wchar_t *ptszContactName = Clist_GetContactDisplayName(hContact);

-	if (ServiceExists(MS_POPUP_ADDPOPUPT) && g_plugin.getByte(ERROR_POPUP_KEY, 0)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPW) && g_plugin.getByte(ERROR_POPUP_KEY, 0)) {

 		mir_snwprintf(newdisplaytext, L"%s\n%s", ptszContactName, displaytext);

-		PUShowMessageT(newdisplaytext, SM_WARNING);

+		PUShowMessageW(newdisplaytext, SM_WARNING);

 	}

 	else if (ServiceExists("OSD/Announce") && g_plugin.getByte(ERROR_POPUP_KEY, 0)) {

 		mir_snwprintf(newdisplaytext, L"%s: %s", ptszContactName, TranslateW(displaytext));

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index 655e17fd2e..135a78f528 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -187,7 +187,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 

 		case IDC_PREVIEW:

 			wchar_t str3[512];

-			POPUPDATAT ppd = { 0 };

+			POPUPDATAW ppd = { 0 };

 

 			GetDlgItemText(hdlg, IDC_DELAY, str3, _countof(str3));

 

@@ -204,15 +204,15 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				TextColour = TextClr;

 			}

 			ppd.lchContact = NULL;

-			mir_wstrcpy(ppd.lptzContactName, _A2W(MODULENAME));

+			mir_wstrcpy(ppd.lpwzContactName, _A2W(MODULENAME));

 			ppd.lchIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_SITE));

-			mir_wstrcpy(ppd.lptzText, TranslateT("This is a preview popup."));

+			mir_wstrcpy(ppd.lpwzText, TranslateT("This is a preview popup."));

 			ppd.colorBack = BGColour;

 			ppd.colorText = TextColour;

 			ppd.PluginWindowProc = nullptr;

 			ppd.iSeconds = _wtol(str3);

 			// display popups

-			PUAddPopupT(&ppd);

+			PUAddPopupW(&ppd);

 		}

 		break;

 

@@ -1092,11 +1092,11 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			}

 			else {

 				CheckDlgButton(hwndDlg, IDC_SUPPRESS, BST_UNCHECKED);

-				if ((ServiceExists(MS_POPUP_ADDPOPUPT) != 0))

+				if ((ServiceExists(MS_POPUP_ADDPOPUPW) != 0))

 					EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 1);

 			}

 

-			if (ServiceExists(MS_POPUP_ADDPOPUPT) == 0)

+			if (ServiceExists(MS_POPUP_ADDPOPUPW) == 0)

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 0);

 

 			if (g_plugin.getByte(UPDATE_ONSTART_KEY, 0)) {

@@ -1167,7 +1167,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			break;

 

 		case IDC_SUPPRESS:

-			if ((ServiceExists(MS_POPUP_ADDPOPUPT) != 0))

+			if ((ServiceExists(MS_POPUP_ADDPOPUPW) != 0))

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), (!(IsDlgButtonChecked(hwndDlg, IDC_SUPPRESS))));

 			break;