From f90be5cdeec5875d1022e1ef35f5b101bd76ac84 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Oct 2012 07:46:53 +0000 Subject: service call replaced with the direct function call git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/config.cpp | 4 ++-- plugins/Popup/src/opt_contacts.cpp | 8 ++++---- plugins/Popup/src/srmm_menu.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index e7908f1099..2ecf985d1f 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -122,8 +122,8 @@ void PopUpPreview() #if defined(_DEBUG) // test per-contact popups - for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0)) + for (HANDLE hContact = db_find_first(); hContact; + hContact = db_find_next(hContact)) { if (DBGetContactSettingDword(hContact, "ICQ", "UIN", 0) == 256771455) { diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp index 16a1963e14..3aaf0b3520 100644 --- a/plugins/Popup/src/opt_contacts.cpp +++ b/plugins/Popup/src/opt_contacts.cpp @@ -122,8 +122,8 @@ INT_PTR CALLBACK DlgProcContactOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case PSN_APPLY: { HWND hwndList = GetDlgItem(hwnd, IDC_LIST); - for (HANDLE hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); hContact; - hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0)) + for (HANDLE hContact=db_find_first(); hContact; + hContact=db_find_next(hContact)) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); for (int i = 0; i < 4 /*SIZEOF(sttIcons)*/; ++i) @@ -162,8 +162,8 @@ static void sttResetListOptions(HWND hwndList) static void sttSetAllContactIcons(HWND hwndList) { - for (HANDLE hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); hContact; - hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0)) + for (HANDLE hContact=db_find_first(); hContact; + hContact=db_find_next(hContact)) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); DWORD dwMode = DBGetContactSettingByte(hContact, MODULNAME, "ShowMode", 0); diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp index 398d500e81..005cdf5765 100644 --- a/plugins/Popup/src/srmm_menu.cpp +++ b/plugins/Popup/src/srmm_menu.cpp @@ -77,11 +77,11 @@ void SrmmMenu_Load() hIconPressed = HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick); hWindowEvent = HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent); /* - HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hContact = db_find_first(); while (hContact) { SrmmMenu_UpdateIcon(hContact); - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0); + hContact = db_find_next(hContact); } */ } -- cgit v1.2.3