From cf9de21af3073e29cb7b149fbd8427241de70729 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 28 Oct 2016 16:18:50 +0300
Subject: - old useless helpers removed from the Options module; - mir_app
 functions introduced instead of them; - OPENOPTIONSDIALOG structure removed
 from m_options.h

---
 protocols/IcqOscarJ/src/icq_opts.cpp    | 16 ++++++++--------
 protocols/IcqOscarJ/src/userinfotab.cpp |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'protocols/IcqOscarJ')

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 94633b1d97..c4e6fb538e 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -511,27 +511,27 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.position = -800000000;
 	odp.hInstance = hInst;
-	odp.pwszGroup = LPGENW("Network");
+	odp.szGroup.w = LPGENW("Network");
 	odp.dwInitParam = LPARAM(this);
-	odp.pwszTitle = m_tszUserName;
+	odp.szTitle.w = m_tszUserName;
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
 
-	odp.pwszTab = LPGENW("Account");
+	odp.szTab.w = LPGENW("Account");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQ);
 	odp.pfnDlgProc = DlgProcIcqOpts;
 	Options_AddPage(wParam, &odp);
 
-	odp.pwszTab = LPGENW("Contacts");
+	odp.szTab.w = LPGENW("Contacts");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQCONTACTS);
 	odp.pfnDlgProc = DlgProcIcqContactsOpts;
 	Options_AddPage(wParam, &odp);
 
-	odp.pwszTab = LPGENW("Features");
+	odp.szTab.w = LPGENW("Features");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQFEATURES);
 	odp.pfnDlgProc = DlgProcIcqFeaturesOpts;
 	Options_AddPage(wParam, &odp);
 
-	odp.pwszTab = LPGENW("Privacy");
+	odp.szTab.w = LPGENW("Privacy");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQPRIVACY);
 	odp.pfnDlgProc = DlgProcIcqPrivacyOpts;
 	Options_AddPage(wParam, &odp);
@@ -541,8 +541,8 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM)
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);
 		odp.groupPosition = 900000000;
 		odp.pfnDlgProc = DlgProcIcqPopupOpts;
-		odp.pwszGroup = LPGENW("Popups");
-		odp.pwszTab = NULL;
+		odp.szGroup.w = LPGENW("Popups");
+		odp.szTab.w = NULL;
 		Options_AddPage(wParam, &odp);
 	}
 	return 0;
diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp
index 607aa13da3..e6be98831a 100644
--- a/protocols/IcqOscarJ/src/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/userinfotab.cpp
@@ -273,14 +273,14 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 	odp.dwInitParam = LPARAM(this);
 	odp.pfnDlgProc = IcqDlgProc;
 	odp.position = -1900000000;
-	odp.pwszTitle = m_tszUserName;
+	odp.szTitle.w = m_tszUserName;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_ICQ);
 	UserInfo_AddPage(wParam, &odp);
 
 	if (!lParam) {
 		wchar_t buf[200];
 		mir_snwprintf(buf, TranslateT("%s Details"), m_tszUserName);
-		odp.pwszTitle = buf;
+		odp.szTitle.w = buf;
 
 		odp.position = -1899999999;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_CHANGEINFO);
-- 
cgit v1.2.3