From 7bdb598e26e7e98788933af43090d34027166969 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Sep 2016 18:01:49 +0000 Subject: second major wipeout of database services & structures: - DBCONTACTENUMSETTINGS removed; - all helpers moved to mir_core.dll git-svn-id: http://svn.miranda-ng.org/main/trunk@17296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewAwaySysMod/src/Options.cpp | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'plugins/NewAwaySysMod/src/Options.cpp') diff --git a/plugins/NewAwaySysMod/src/Options.cpp b/plugins/NewAwaySysMod/src/Options.cpp index 0a81d2f701..dd33eb8d02 100644 --- a/plugins/NewAwaySysMod/src/Options.cpp +++ b/plugins/NewAwaySysMod/src/Options.cpp @@ -299,13 +299,8 @@ void COptItem_TreeCtrl::DBToMem(const CString &sModule, CString *sDBSettingPrefi m_value.RemoveAll(); sTreeReadEnumData pData(this, sModule, *sDBSettingPrefix); + db_enum_settings(NULL, TreeReadEnum, sModule, &pData); - DBCONTACTENUMSETTINGS dbEnum; - dbEnum.lParam = (LPARAM)&pData; - dbEnum.ofsSettings = 0; - dbEnum.pfnEnumProc = TreeReadEnum; - dbEnum.szModule = sModule; - CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbEnum); if (!m_value.GetSize()) { m_value = m_defValue; } @@ -481,12 +476,7 @@ void COptItem_TreeCtrl::CleanDBSettings(const CString &sModule, CString *sDBSett sTreeDeleteEnumData TreeDeleteEnumData; TreeDeleteEnumData.TreeCtrl = this; TreeDeleteEnumData.sDBSettingPrefix = sDBSettingPrefix; - DBCONTACTENUMSETTINGS dbEnum; - dbEnum.lParam = (LPARAM)&TreeDeleteEnumData; - dbEnum.ofsSettings = 0; - dbEnum.pfnEnumProc = TreeDeleteEnum; - dbEnum.szModule = sModule; - CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbEnum); + db_enum_settings(NULL, TreeDeleteEnum, sModule, &TreeDeleteEnumData); for (int i = 0; i < TreeDeleteEnumData.TreeSettings.GetSize(); i++) db_unset(NULL, sModule, TreeDeleteEnumData.TreeSettings[i]); @@ -672,12 +662,8 @@ void COptItem_ListCtrl::DBToMem(const CString &sModule, CString *sDBSettingPrefi m_value.RemoveAll(); sListReadEnumData pData(this, sModule, *sDBSettingPrefix); - DBCONTACTENUMSETTINGS dbEnum; - dbEnum.lParam = (LPARAM)&pData; - dbEnum.ofsSettings = 0; - dbEnum.pfnEnumProc = ListReadEnum; - dbEnum.szModule = sModule; - CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbEnum); + db_enum_settings(NULL, ListReadEnum, sModule, &pData); + if (!m_value.GetSize()) m_value = m_defValue; else { @@ -752,12 +738,7 @@ void COptItem_ListCtrl::CleanDBSettings(const CString &sModule, CString *sDBSett sListDeleteEnumData ListDeleteEnumData; ListDeleteEnumData.ListCtrl = this; ListDeleteEnumData.sDBSettingPrefix = sDBSettingPrefix; - DBCONTACTENUMSETTINGS dbEnum; - dbEnum.lParam = (LPARAM)&ListDeleteEnumData; - dbEnum.ofsSettings = 0; - dbEnum.pfnEnumProc = ListDeleteEnum; - dbEnum.szModule = sModule; - CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbEnum); + db_enum_settings(NULL, ListDeleteEnum, sModule, &ListDeleteEnumData); for (int i = 0; i < ListDeleteEnumData.ListSettings.GetSize(); i++) db_unset(NULL, sModule, ListDeleteEnumData.ListSettings[i]); -- cgit v1.2.3