From 587803cebb8994fde831a26c8b6f126ff42caeb1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Oct 2016 13:25:53 +0300 Subject: OPTIONSDIALOGPAGE::groupPosition - unused field removed --- include/delphi/m_options.inc | 1 - include/m_options.h | 1 - plugins/Exchange/src/hooked_events.cpp | 1 - plugins/FavContacts/src/options.cpp | 1 - plugins/Folders/src/dlg_handlers.cpp | 1 - plugins/KeyboardNotify/src/options.cpp | 1 - plugins/Msg_Export/src/options.cpp | 1 - plugins/NotifyAnything/src/options.cpp | 1 - plugins/Popup/src/main.cpp | 1 - plugins/StartupSilence/src/main.cpp | 1 - plugins/StatusManager/src/ks_options.cpp | 1 - plugins/TabSRMM/src/typingnotify.cpp | 1 - plugins/TooltipNotify/src/TooltipNotify.cpp | 1 - plugins/TrafficCounter/src/options.cpp | 14 ++++++-------- plugins/Variables/src/options.cpp | 15 +++++++-------- plugins/Weather/src/weather_opt.cpp | 1 - plugins/WhenWasIt/src/hooked_events.cpp | 1 - plugins/ZeroNotification/src/main.cpp | 1 - plugins/wbOSD/src/options.cpp | 1 - protocols/EmLanProto/src/amdproto.cpp | 1 - protocols/IcqOscarJ/src/icq_opts.cpp | 1 - protocols/MRA/src/MraPopUp.cpp | 1 - src/core/stduserinfo/src/userinfo.cpp | 1 - src/mir_app/src/proto_order.cpp | 1 - 24 files changed, 13 insertions(+), 38 deletions(-) diff --git a/include/delphi/m_options.inc b/include/delphi/m_options.inc index 96b643b40b..4ae7ef6091 100644 --- a/include/delphi/m_options.inc +++ b/include/delphi/m_options.inc @@ -60,7 +60,6 @@ type pszTemplate :PAnsiChar; hInstance :THANDLE; hIcon :HICON; // - groupPosition :int; // hLangpack :int; hGroupIcon :HICON; // flags :dword; // diff --git a/include/m_options.h b/include/m_options.h index dabcdf7375..86c7da6e75 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -65,7 +65,6 @@ struct OPTIONSDIALOGPAGE char *pszTemplate; HINSTANCE hInstance; HICON hIcon; - int groupPosition; int hLangpack; HICON hGroupIcon; DWORD flags; diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index afa9da5c32..5f1b31b62a 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -84,7 +84,6 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXCHANGE); odp.szTitle.w = LPGENW("Exchange notify"); odp.szGroup.w = LPGENW("Plugins"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pfnDlgProc = DlgProcOptions; Options_AddPage(wParam, &odp); diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp index d0ebe942b3..e479ee58ce 100644 --- a/plugins/FavContacts/src/options.cpp +++ b/plugins/FavContacts/src/options.cpp @@ -259,7 +259,6 @@ int ProcessOptInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.szGroup.a = LPGEN("Contacts"); odp.szTitle.a = LPGEN("Favorites"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = OptionsDlgProc; Options_AddPage(wParam, &odp); diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index 621cdb87b8..8f26cd0e7e 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -253,7 +253,6 @@ static int OnOptionsInitialize(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FOLDERS); odp.szTitle.a = LPGEN("Folders"); odp.szGroup.a = LPGEN("Customize"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcOpts; Options_AddPage(wParam, &odp); diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index d4c006aad0..c53a626859 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -1390,7 +1390,6 @@ int InitializeOptions(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.szTitle.a = LPGEN("Keyboard Flash"); odp.szGroup.a = LPGEN("Events"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcOptions; Options_AddPage(wParam, &odp); diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 98a32d40a8..4c52cfb599 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -1230,7 +1230,6 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) odp.szTitle.w = LPGENW("Message export"); odp.szGroup.w = LPGENW("History"); odp.szTab.w = LPGENW("General"); - odp.groupPosition = 100000000; odp.pfnDlgProc = DlgProcMsgExportOpts; Options_AddPage(wParam, &odp); diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp index d8dd4aca04..1cd464447b 100644 --- a/plugins/NotifyAnything/src/options.cpp +++ b/plugins/NotifyAnything/src/options.cpp @@ -178,7 +178,6 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Plugins"); odp.position = 100000000; odp.hInstance = hInst; - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; Options_AddPage(wParam, &odp); return 0; diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index e210ab86e9..429df0e8f2 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -63,7 +63,6 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100000000; - odp.groupPosition = 910000000; odp.hInstance = hInst; odp.flags = ODPF_BOLDGROUPS; odp.szTitle.a = MODULNAME_PLU; diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 032362c92f..833489044c 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -465,7 +465,6 @@ int InitializeOptions(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_SSOPT); odp.szGroup.a = LPGEN("Events");//FIXME: move to...Group? odp.szTitle.a = MENU_NAME; - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcOptions; Options_AddPage(wParam, &odp); diff --git a/plugins/StatusManager/src/ks_options.cpp b/plugins/StatusManager/src/ks_options.cpp index 84b86f4458..e76a4464b6 100644 --- a/plugins/StatusManager/src/ks_options.cpp +++ b/plugins/StatusManager/src/ks_options.cpp @@ -578,7 +578,6 @@ int KeepStatusOptionsInit(WPARAM wparam, LPARAM) memset(&odp, 0, sizeof(odp)); odp.position = 150000000; odp.szGroup.w = LPGENW("Popups"); - odp.groupPosition = 910000000; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_PUOPT_KEEPSTATUS); odp.szTitle.w = LPGENW("Keep status"); diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index 4e9d1dfd2f..0038d9122e 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -498,7 +498,6 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TYPINGNOTIFYPOPUP); odp.szTitle.a = LPGEN("Typing notify"); odp.szGroup.a = LPGEN("Popups"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcOpts; Options_AddPage(wParam, &odp); diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 356d28f22b..fc3e2ccd9d 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -262,7 +262,6 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.szTitle.a = LPGEN("Tooltip Notify"); odp.szGroup.a = LPGEN("Popups"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = CTooltipNotify::OptionsDlgProcWrapper; ::Options_AddPage(wParam, &odp); diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index 5e7a0ca158..c65d82e203 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -344,7 +344,6 @@ int TrafficCounterOptInitialise(WPARAM wParam, LPARAM) // Main options page OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 900000000; - odp.groupPosition = 1; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TRAFFIC); odp.szGroup.a = LPGEN("Services"); @@ -359,15 +358,14 @@ int TrafficCounterOptInitialise(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Statistics"); odp.pfnDlgProc = DlgProcOptStatistics; Options_AddPage(wParam, &odp); - + // Popups option page if (bPopupExists) { - odp.groupPosition = 100; - odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_TRAFFIC_POPUPS); - odp.szGroup.a=LPGEN("Popups"); - odp.szTitle.a=LPGEN("Traffic counter"); - odp.pfnDlgProc=DlgProcPopupsTraffic; - odp.flags=ODPF_BOLDGROUPS; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TRAFFIC_POPUPS); + odp.szGroup.a = LPGEN("Popups"); + odp.szTitle.a = LPGEN("Traffic counter"); + odp.pfnDlgProc = DlgProcPopupsTraffic; + odp.flags = ODPF_BOLDGROUPS; Options_AddPage(wParam, &odp); } return 0; diff --git a/plugins/Variables/src/options.cpp b/plugins/Variables/src/options.cpp index 5b13a740a8..4c917a55f0 100644 --- a/plugins/Variables/src/options.cpp +++ b/plugins/Variables/src/options.cpp @@ -130,14 +130,13 @@ static INT_PTR CALLBACK SetOptsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA int OptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.position = 150000000; - odp.szGroup.a = LPGEN("Services"); - odp.groupPosition = 910000000; - odp.hInstance = hInst; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTS_DIALOG); - odp.szTitle.a = LPGEN("Variables"); - odp.pfnDlgProc = SetOptsDlgProc; - odp.flags = ODPF_BOLDGROUPS; + odp.flags = ODPF_BOLDGROUPS; + odp.position = 150000000; + odp.szGroup.a = LPGEN("Services"); + odp.szTitle.a = LPGEN("Variables"); + odp.hInstance = hInst; + odp.pfnDlgProc = SetOptsDlgProc; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTS_DIALOG); Options_AddPage(wParam, &odp); return 0; } diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 9c0e515806..a84b00d61c 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -594,7 +594,6 @@ int OptInit(WPARAM wParam, LPARAM) odp.position = 100000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP); odp.szGroup.a = LPGEN("Popups"); - odp.groupPosition = 910000000; odp.szTab.a = NULL; odp.pfnDlgProc = DlgPopupOpts; Options_AddPage(wParam, &odp); diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index b7420a583e..4118efa6e1 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -48,7 +48,6 @@ static int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WWI); odp.szTitle.w = LPGENW("Birthdays"); odp.szGroup.w = LPGENW("Contacts"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pfnDlgProc = DlgProcOptions; Options_AddPage(wParam, &odp); diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index 7dc4995d7e..be2d36af00 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -210,7 +210,6 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOSOUND); odp.szTitle.w = LPGENW("Zero Notifications"); odp.szGroup.w = LPGENW("Plugins"); - odp.groupPosition = 100000000; odp.pfnDlgProc = DlgProcNoSoundOpts; Options_AddPage(wParam, &odp); return 0; diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index bfb913ff8a..e779cea271 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -411,7 +411,6 @@ int OptionsInit(WPARAM wparam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 150000000; - odp.groupPosition = 950000000; odp.hInstance = hI; odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG1); odp.szGroup.w = LPGENW("Plugins"); diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index e1203d023e..4ad6a6c077 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -280,7 +280,6 @@ int __cdecl EMPCreateOptionsDlg(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCE(IDD_EMP_FORM_OPT); odp.szTitle.a = LPGEN("E-mage LAN protocol"); odp.szGroup.a = LPGEN("Network"); - odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = EMPDlgProcMainOpts; Options_AddPage(wParam, &odp); diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index c4e6fb538e..64804704c2 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -539,7 +539,6 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) if (bPopupService) { odp.position = 100000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); - odp.groupPosition = 900000000; odp.pfnDlgProc = DlgProcIcqPopupOpts; odp.szGroup.w = LPGENW("Popups"); odp.szTab.w = NULL; diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index 75db5f0f89..8f4218176f 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -133,7 +133,6 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); odp.szTitle.w = m_tszUserName; odp.szGroup.w = LPGENW("Popups"); - odp.groupPosition = 900000000; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pfnDlgProc = MraPopupDlgProcOpts; Options_AddPage(wParam, &odp); diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index 04bd08fba3..f91d8df795 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -157,7 +157,6 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam) dst->hLangpack = odp->hLangpack; dst->flags = odp->flags; - dst->groupPosition = odp->groupPosition; dst->hGroupIcon = odp->hGroupIcon; dst->hIcon = odp->hIcon; dst->dwInitParam = odp->dwInitParam; diff --git a/src/mir_app/src/proto_order.cpp b/src/mir_app/src/proto_order.cpp index 5a480ccbcf..2e134bc30a 100644 --- a/src/mir_app/src/proto_order.cpp +++ b/src/mir_app/src/proto_order.cpp @@ -221,7 +221,6 @@ int ProtocolOrderOptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -10000000; - odp.groupPosition = 1000000; odp.szTitle.a = LPGEN("Accounts"); odp.szGroup.a = LPGEN("Contact list"); odp.pDialog = new CProtocolOrderOpts(); -- cgit v1.2.3