From 423be683866fd8e305457eb725d8cdbe1f297fbd Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 27 Feb 2019 12:43:20 +0300
Subject: popup code cleaning (cause we have no tchar.h)

---
 protocols/Twitter/src/connection.cpp | 10 +++++-----
 protocols/Twitter/src/proto.cpp      | 26 +++++++++++++-------------
 protocols/Twitter/src/ui.cpp         |  8 ++++----
 3 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'protocols/Twitter/src')

diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index 901f6994ca..195fca892f 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -484,11 +484,11 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 
 void TwitterProto::ShowContactPopup(MCONTACT hContact, const std::string &text, const std::string *url)
 {
-	if (!ServiceExists(MS_POPUP_ADDPOPUPT) || getByte(TWITTER_KEY_POPUP_SHOW) == 0) {
+	if (!ServiceExists(MS_POPUP_ADDPOPUPW) || getByte(TWITTER_KEY_POPUP_SHOW) == 0) {
 		return;
 	}
 
-	POPUPDATAT popup = {};
+	POPUPDATAW popup = {};
 	popup.lchContact = hContact;
 	popup.iSeconds = getDword(TWITTER_KEY_POPUP_TIMEOUT);
 
@@ -501,7 +501,7 @@ void TwitterProto::ShowContactPopup(MCONTACT hContact, const std::string &text,
 
 	DBVARIANT dbv;
 	if (!db_get_ws(hContact, "CList", "MyHandle", &dbv) || !getWString(hContact, TWITTER_KEY_UN, &dbv)) {
-		wcsncpy(popup.lptzContactName, dbv.pwszVal, MAX_CONTACTNAME);
+		wcsncpy(popup.lpwzContactName, dbv.pwszVal, MAX_CONTACTNAME);
 		db_free(&dbv);
 	}
 
@@ -510,8 +510,8 @@ void TwitterProto::ShowContactPopup(MCONTACT hContact, const std::string &text,
 		popup.PluginData = (void *)url;
 	}
 
-	mbcs_to_tcs(CP_UTF8, text.c_str(), popup.lptzText, MAX_SECONDLINE);
-	PUAddPopupT(&popup);
+	mbcs_to_tcs(CP_UTF8, text.c_str(), popup.lpwzText, MAX_SECONDLINE);
+	PUAddPopupW(&popup);
 }
 
 void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg)
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 7ad53590e0..2664441c12 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -279,7 +279,7 @@ int TwitterProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = options_proc;
 	g_plugin.addOptions(wParam, &odp);
 
-	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
+	if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
 		odp.szTab.w = LPGENW("Popups");
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS);
 		odp.pfnDlgProc = popup_options_proc;
@@ -335,9 +335,9 @@ int TwitterProto::ShowPinDialog()
 
 void TwitterProto::ShowPopup(const wchar_t *text, int Error)
 {
-	POPUPDATAT popup = {};
-	mir_snwprintf(popup.lptzContactName, TranslateT("%s Protocol"), m_tszUserName);
-	wcsncpy_s(popup.lptzText, text, _TRUNCATE);
+	POPUPDATAW popup = {};
+	mir_snwprintf(popup.lpwzContactName, TranslateT("%s Protocol"), m_tszUserName);
+	wcsncpy_s(popup.lpwzText, text, _TRUNCATE);
 
 	if (Error) {
 		popup.iSeconds = -1;
@@ -345,27 +345,27 @@ void TwitterProto::ShowPopup(const wchar_t *text, int Error)
 		popup.colorText = 0x00FFFFFF;
 	}
 
-	if (ServiceExists(MS_POPUP_ADDPOPUPT))
-		PUAddPopupT(&popup);
+	if (ServiceExists(MS_POPUP_ADDPOPUPW))
+		PUAddPopupW(&popup);
 	else
-		MessageBox(nullptr, popup.lptzText, popup.lptzContactName, 0);
+		MessageBox(nullptr, popup.lpwzText, popup.lpwzContactName, 0);
 }
 
 void TwitterProto::ShowPopup(const char *text, int Error)
 {
-	POPUPDATAT popup = {};
-	mir_snwprintf(popup.lptzContactName, TranslateT("%s Protocol"), m_tszUserName);
-	mbcs_to_tcs(CP_UTF8, text, popup.lptzText, _countof(popup.lptzText));
+	POPUPDATAW popup = {};
+	mir_snwprintf(popup.lpwzContactName, TranslateT("%s Protocol"), m_tszUserName);
+	mbcs_to_tcs(CP_UTF8, text, popup.lpwzText, _countof(popup.lpwzText));
 	if (Error) {
 		popup.iSeconds = -1;
 		popup.colorBack = 0x000000FF;
 		popup.colorText = 0x00FFFFFF;
 	}
 
-	if (ServiceExists(MS_POPUP_ADDPOPUPT))
-		PUAddPopupT(&popup);
+	if (ServiceExists(MS_POPUP_ADDPOPUPW))
+		PUAddPopupW(&popup);
 	else
-		MessageBox(nullptr, popup.lptzText, popup.lptzContactName, 0);
+		MessageBox(nullptr, popup.lpwzText, popup.lpwzContactName, 0);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp
index 65fde0c17c..c4d4e50a39 100644
--- a/protocols/Twitter/src/ui.cpp
+++ b/protocols/Twitter/src/ui.cpp
@@ -314,7 +314,7 @@ namespace popup_options
 
 	static void preview(HWND hwndDlg)
 	{
-		POPUPDATAT popup = {};
+		POPUPDATAW popup = {};
 
 		// Pick a random contact
 		MCONTACT hContact = 0;
@@ -328,15 +328,15 @@ namespace popup_options
 
 		// Pick a random quote
 		int q = rand() % _countof(quotes);
-		wcsncpy(popup.lptzContactName, quotes[q].name, MAX_CONTACTNAME);
-		wcsncpy(popup.lptzText, quotes[q].text, MAX_SECONDLINE);
+		wcsncpy(popup.lpwzContactName, quotes[q].name, MAX_CONTACTNAME);
+		wcsncpy(popup.lpwzText, quotes[q].text, MAX_SECONDLINE);
 
 		popup.lchContact = hContact;
 		popup.iSeconds = get_timeout(hwndDlg);
 		popup.colorText = get_text_color(hwndDlg, false);
 		popup.colorBack = get_back_color(hwndDlg, false);
 
-		PUAddPopupT(&popup);
+		PUAddPopupW(&popup);
 	}
 }
 
-- 
cgit v1.2.3