diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-10-10 07:46:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-10-10 07:46:53 +0000 |
| commit | f90be5cdeec5875d1022e1ef35f5b101bd76ac84 (patch) | |
| tree | 59e5e8bf3b6a87dbee148bd63f841a8a62daac5f /protocols/IcqOscarJ | |
| parent | ed10055737300c07e485eb22b27ccf92ffadab7c (diff) | |
service call replaced with the direct function call
git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/icq_db.cpp | 9 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/icq_uploadui.cpp | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/protocols/IcqOscarJ/icq_db.cpp b/protocols/IcqOscarJ/icq_db.cpp index b142c30cac..f199860df8 100644 --- a/protocols/IcqOscarJ/icq_db.cpp +++ b/protocols/IcqOscarJ/icq_db.cpp @@ -364,7 +364,7 @@ HANDLE CIcqProto::AddEvent(HANDLE hContact, WORD wType, DWORD dwTime, DWORD flag HANDLE CIcqProto::FindFirstContact()
{
- HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, (LPARAM)m_szModuleName);
+ HANDLE hContact = db_find_first(m_szModuleName);
if (IsICQContact(hContact))
return hContact;
@@ -375,15 +375,12 @@ HANDLE CIcqProto::FindFirstContact() HANDLE CIcqProto::FindNextContact(HANDLE hContact)
{
- hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,(LPARAM)m_szModuleName);
-
+ hContact = db_find_next(hContact, m_szModuleName);
while (hContact != NULL)
{
if (IsICQContact(hContact))
- {
return hContact;
- }
- hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,(LPARAM)m_szModuleName);
+ hContact = db_find_next(hContact, m_szModuleName);
}
return hContact;
}
diff --git a/protocols/IcqOscarJ/icq_uploadui.cpp b/protocols/IcqOscarJ/icq_uploadui.cpp index 217389b463..f5e5c937b3 100644 --- a/protocols/IcqOscarJ/icq_uploadui.cpp +++ b/protocols/IcqOscarJ/icq_uploadui.cpp @@ -115,7 +115,7 @@ static void DeleteOtherContactsFromControl(HWND hCtrl, CIcqProto* ppro) HANDLE hContact;
HANDLE hItem;
- hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
+ hContact = db_find_first();
while (hContact)
{
hItem = (HANDLE)SendMessage(hCtrl, CLM_FINDCONTACT, (WPARAM)hContact, 0);
@@ -124,7 +124,7 @@ static void DeleteOtherContactsFromControl(HWND hCtrl, CIcqProto* ppro) if (!ppro->IsICQContact(hContact))
SendMessage(hCtrl, CLM_DELETEITEM, (WPARAM)hItem, 0);
}
- hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);
+ hContact = db_find_next(hContact);
}
}
@@ -709,7 +709,7 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg,UINT message,WPARAM wPara SAFE_FREE((void**)&pszGroup);
}
}
- hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);
+ hContact = db_find_next(hContact);
}
if (!hContact)
{
@@ -785,7 +785,7 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg,UINT message,WPARAM wPara break;
}
}
- hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);
+ hContact = db_find_next(hContact);
}
if (!hContact)
{
|