- old useless helpers removed from the Options module;

- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h

3 files changed, 10 insertions, 10 deletions

diff --git a/plugins/StatusManager/src/aaa_options.cpp b/plugins/StatusManager/src/aaa_options.cpp
index 60d8cec21e..d26678c1ce 100644
--- a/plugins/StatusManager/src/aaa_options.cpp
+++ b/plugins/StatusManager/src/aaa_options.cpp
@@ -514,8 +514,8 @@ int AutoAwayOptInitialise(WPARAM wParam, LPARAM)
 	odp.position = 1000000000;
 	odp.hInstance = hInst;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABS);
-	odp.pszTitle = LPGEN("Auto away");
-	odp.pszGroup = LPGEN("Status");
+	odp.szTitle.a = LPGEN("Auto away");
+	odp.szGroup.a = LPGEN("Status");
 	odp.pfnDlgProc = DlgProcAutoAwayTabs;
 	odp.flags = ODPF_BOLDGROUPS;
 	Options_AddPage(wParam, &odp);
diff --git a/plugins/StatusManager/src/ks_options.cpp b/plugins/StatusManager/src/ks_options.cpp
index 52ede459fe..84b86f4458 100644
--- a/plugins/StatusManager/src/ks_options.cpp
+++ b/plugins/StatusManager/src/ks_options.cpp
@@ -567,8 +567,8 @@ int KeepStatusOptionsInit(WPARAM wparam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.hInstance = hInst;
-	odp.pwszGroup = LPGENW("Status");
-	odp.pwszTitle = LPGENW("Keep status");
+	odp.szGroup.w = LPGENW("Status");
+	odp.szTitle.w = LPGENW("Keep status");
 	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABS);
 	odp.pfnDlgProc = DlgProcKsTabs;
@@ -577,11 +577,11 @@ int KeepStatusOptionsInit(WPARAM wparam, LPARAM)
 	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
 		memset(&odp, 0, sizeof(odp));
 		odp.position = 150000000;
-		odp.pwszGroup = LPGENW("Popups");
+		odp.szGroup.w = LPGENW("Popups");
 		odp.groupPosition = 910000000;
 		odp.hInstance = hInst;
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_PUOPT_KEEPSTATUS);
-		odp.pwszTitle = LPGENW("Keep status");
+		odp.szTitle.w = LPGENW("Keep status");
 		odp.pfnDlgProc = PopupOptDlgProc;
 		odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 		Options_AddPage(wparam, &odp);
diff --git a/plugins/StatusManager/src/ss_options.cpp b/plugins/StatusManager/src/ss_options.cpp
index ce4c047801..2acf61483f 100644
--- a/plugins/StatusManager/src/ss_options.cpp
+++ b/plugins/StatusManager/src/ss_options.cpp
@@ -905,16 +905,16 @@ int StartupStatusOptionsInit(WPARAM wparam,LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.hInstance = hInst;
-	odp.pszGroup = LPGEN("Status");
-	odp.pszTitle = LPGEN("Startup status");
+	odp.szGroup.a = LPGEN("Status");
+	odp.szTitle.a = LPGEN("Startup status");
 	odp.flags = ODPF_BOLDGROUPS;
 
-	odp.pszTab = LPGEN("General");
+	odp.szTab.a = LPGEN("General");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STARTUPSTATUS);
 	odp.pfnDlgProc = StartupStatusOptDlgProc;
 	Options_AddPage(wparam,&odp);
 
-	odp.pszTab = LPGEN("Status profiles");
+	odp.szTab.a = LPGEN("Status profiles");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STATUSPROFILES);
 	odp.pfnDlgProc = StatusProfilesOptDlgProc;
 	Options_AddPage(wparam,&odp);