From 41ee395da7530c17656bd06f84638ab8d9d3776d Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 23:36:07 +0300
Subject: options API unbound from hLangpack and switched to CMPlugin

---
 src/core/stdaway/src/sendmsg.cpp     | 2 +-
 src/core/stdclist/src/clcopts.cpp    | 4 ++--
 src/core/stdclist/src/clistopts.cpp  | 2 +-
 src/core/stdclist/src/cluiopts.cpp   | 4 ++--
 src/core/stdfile/src/fileopts.cpp    | 2 +-
 src/core/stdidle/src/options.cpp     | 2 +-
 src/core/stdmsg/src/chat_options.cpp | 6 +++---
 src/core/stdmsg/src/msgoptions.cpp   | 8 ++++----
 8 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index 532ad9d1ec..cc416c4ef6 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -523,7 +523,7 @@ static int AwayMsgOptInitialise(WPARAM wParam, LPARAM)
 	odp.szGroup.a = LPGEN("Status");
 	odp.pfnDlgProc = DlgProcAwayMsgOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
 
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index e2790adc9c..311e3a959d 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -430,12 +430,12 @@ int ClcOptInit(WPARAM wParam, LPARAM)
 	odp.szTitle.a = LPGEN("List");
 	odp.pfnDlgProc = DlgProcClcMainOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);
 	odp.szTitle.a = LPGEN("List background");
 	odp.pfnDlgProc = DlgProcClcBkgOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index cf77a0d953..623787e931 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -199,6 +199,6 @@ int CListOptInit(WPARAM wParam, LPARAM)
 	odp.szTitle.a = LPGEN("Contact list");
 	odp.pfnDlgProc = DlgProcGenOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index a2afe36280..f4607ada42 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -317,12 +317,12 @@ int CluiOptInit(WPARAM wParam, LPARAM)
 	odp.szGroup.a = LPGEN("Contact list");
 	odp.pfnDlgProc = DlgProcCluiOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
 	odp.szTitle.a = LPGEN("Status bar");
 	odp.pfnDlgProc = DlgProcSBarOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp
index 3d75637686..88a320883d 100644
--- a/src/core/stdfile/src/fileopts.cpp
+++ b/src/core/stdfile/src/fileopts.cpp
@@ -232,6 +232,6 @@ int FileOptInitialise(WPARAM wParam, LPARAM)
 	odp.szGroup.a = LPGEN("Events");
 	odp.pfnDlgProc = DlgProcFileOpts;
 	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/src/core/stdidle/src/options.cpp b/src/core/stdidle/src/options.cpp
index 8d34a2909a..4b9beab7ac 100644
--- a/src/core/stdidle/src/options.cpp
+++ b/src/core/stdidle/src/options.cpp
@@ -129,6 +129,6 @@ int IdleOptInit(WPARAM wParam, LPARAM)
 	odp.szTitle.a = LPGEN("Idle");
 	odp.flags = ODPF_BOLDGROUPS;
 	odp.pDialog = new COptionsDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index 45880e5bfc..10b645db68 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -672,12 +672,12 @@ int ChatOptionsInitialize(WPARAM wParam)
 	odp.position = 910000000;
 	odp.szTab.a = LPGEN("General");
 	odp.pDialog = new COptMainDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	odp.position = 910000001;
 	odp.szTab.a = LPGEN("Chat log");
 	odp.pDialog = new COptLogDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	if (PopupInstalled) {
 		odp.position = 910000002;
@@ -685,7 +685,7 @@ int ChatOptionsInitialize(WPARAM wParam)
 		odp.szGroup.a = LPGEN("Popups");
 		odp.szTab.a = nullptr;
 		odp.pDialog = new COptPopupDlg();
-		Options_AddPage(wParam, &odp);
+		g_plugin.addOptions(wParam, &odp);
 	}
 	return 0;
 }
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 204f34eaff..640841691d 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -586,19 +586,19 @@ static int OptInitialise(WPARAM wParam, LPARAM)
 
 	odp.szTitle.a = LPGEN("Message sessions");
 	odp.pDialog = new COptionMainDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	odp.szTab.a = LPGEN("Messaging log");
 	odp.pDialog = new COptionLogDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	odp.szTab.a = LPGEN("Typing notify");
 	odp.pDialog = new COptionTypingDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	odp.szTab.a = LPGEN("Tabs");
 	odp.pDialog = new COptionsTabDlg();
-	Options_AddPage(wParam, &odp);
+	g_plugin.addOptions(wParam, &odp);
 
 	ChatOptionsInitialize(wParam);
 	return 0;
-- 
cgit v1.2.3