- old useless helpers removed from the Options module;

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

5 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index bedd6e2e14..0b4adb1ce7 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -268,8 +268,8 @@ int QuotesEventFunc_OptInitialise(WPARAM wp, LPARAM/* lp*/)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 910000000;

 	odp.hInstance = g_hInstance;

-	odp.pwszTitle = _T(QUOTES_PROTOCOL_NAME);

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

+	odp.szTitle.w = _T(QUOTES_PROTOCOL_NAME);

+	odp.szGroup.w = LPGENW("Network");

 	odp.hIcon = Quotes_LoadIconEx(IDI_ICON_MAIN);

 	odp.flags = ODPF_USERINFOTAB | ODPF_UNICODE;

 

diff --git a/plugins/Quotes/src/OptionDukasCopy.cpp b/plugins/Quotes/src/OptionDukasCopy.cpp
index 6a5b8b0fc6..12c53f1753 100644
--- a/plugins/Quotes/src/OptionDukasCopy.cpp
+++ b/plugins/Quotes/src/OptionDukasCopy.cpp
@@ -314,6 +314,6 @@ void ShowDukasCopyPropPage(CQuotesProviderDukasCopy* pProvider, WPARAM wp, OPTIO
 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_ECONOMIC_RATES);

 	odp.pfnDlgProc = EconomicRatesDlgProc;

-	odp.pwszTab = const_cast<LPTSTR>(pi.m_sName.c_str());

+	odp.szTab.w = const_cast<LPTSTR>(pi.m_sName.c_str());

 	Options_AddPage(wp, &odp);

 }

diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp
index ac9471c959..5e3d355590 100644
--- a/plugins/Quotes/src/QuoteInfoDlg.cpp
+++ b/plugins/Quotes/src/QuoteInfoDlg.cpp
@@ -113,7 +113,7 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp, LPARAM lp)
 	odp.pfnDlgProc = QuoteInfoDlgProc;

 	odp.position = -2000000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_QUOTE_INFO);

-	odp.pszTitle = LPGEN("Quote");

+	odp.szTitle.a = LPGEN("Quote");

 	UserInfo_AddPage(wp, &odp);

 	return 0;

 }

diff --git a/plugins/Quotes/src/QuotesProviderFinance.cpp b/plugins/Quotes/src/QuotesProviderFinance.cpp
index d17a1c39ea..686a1406a4 100644
--- a/plugins/Quotes/src/QuotesProviderFinance.cpp
+++ b/plugins/Quotes/src/QuotesProviderFinance.cpp
@@ -260,6 +260,6 @@ void CQuotesProviderFinance::ShowPropertyPage(WPARAM wp, OPTIONSDIALOGPAGE &odp)
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_OPT_FINANCE);

 	odp.pfnDlgProc = GoogleFinanceOptDlgProc;

 	odp.dwInitParam = LPARAM(this);

-	odp.pwszTab = const_cast<LPTSTR>(GetInfo().m_sName.c_str());

+	odp.szTab.w = const_cast<LPTSTR>(GetInfo().m_sName.c_str());

 	Options_AddPage(wp, &odp);

 }

diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp
index fb530adb06..63b60b3e8b 100644
--- a/plugins/Quotes/src/QuotesProviderGoogle.cpp
+++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp
@@ -382,7 +382,7 @@ void CQuotesProviderGoogle::ShowPropertyPage(WPARAM wp, OPTIONSDIALOGPAGE &odp)
 {

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_OPT_GOOGLE);

 	odp.pfnDlgProc = GoogleOptDlgProc;

-	odp.pwszTab = const_cast<LPTSTR>(GetInfo().m_sName.c_str());

+	odp.szTab.w = const_cast<LPTSTR>(GetInfo().m_sName.c_str());

 	Options_AddPage(wp, &odp);

 }