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/Msg_Export/src/options.cpp | 4 ++-- plugins/Msg_Export/src/utils.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Msg_Export/src') diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 9bfe4a054a..d413961f26 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -733,7 +733,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar { tstring sTmp; LVITEM sItem = { 0 }; - HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hContact = db_find_first(); for( int nUser = 0; /*hContact*/ ; nUser++ ) { sItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; @@ -771,7 +771,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar if( ! hContact ) // written like this to add the current user ( handle = 0 ) break; - hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0); + hContact = db_find_next(hContact); } ListView_SortItems( hMapUser , CompareFunc , 1 ); diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index cc53a06555..ae45d82bad 100755 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -910,7 +910,7 @@ void UpdateFileToColWidth() { clFileTo1ColWidth.clear(); - HANDLE hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hContact = db_find_first(); for(;;) { tstring sNick = NickFromHandle( hContact ); @@ -921,7 +921,7 @@ void UpdateFileToColWidth() if( ! hContact ) break; - hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0); + hContact = db_find_next(hContact); } } @@ -1626,7 +1626,7 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/) tstring sFilePath = GetFilePathFromUser( hContact ); { // Test if there is another user using this file - HANDLE hOtherContact = (HANDLE) CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hOtherContact = db_find_first(); for(;;) { if( hContact != hOtherContact && sFilePath == GetFilePathFromUser( hOtherContact ) ) @@ -1636,7 +1636,7 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/) if( ! hOtherContact ) break; - hOtherContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hOtherContact, 0); + hOtherContact = db_find_next(hOtherContact); } } -- cgit v1.2.3