service call replaced with the direct function call

git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 14 insertions, 14 deletions

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 7550a420d5..7c1ec84dda 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -392,7 +392,7 @@ void cliRebuildEntireList(HWND hwnd,struct ClcData *dat)
 		}

 	}

 

-	hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+	hContact = db_find_first();

 	while(hContact) 

     {

 		pdisplayNameCacheEntry cacheEntry = NULL;

@@ -436,7 +436,7 @@ void cliRebuildEntireList(HWND hwnd,struct ClcData *dat)
 			if (cont->proto && g_szMetaModuleName && dat->IsMetaContactsEnabled  && strcmp(cont->proto,g_szMetaModuleName) == 0)

 				AddSubcontacts(dat,cont,CLCItems_IsShowOfflineGroup(group));

 		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0);

+		hContact = db_find_next(hContact);

 	}

 

 	if (style&CLS_HIDEEMPTYGROUPS) {

diff --git a/plugins/Clist_modern/src/modern_extraimage.cpp b/plugins/Clist_modern/src/modern_extraimage.cpp
index 5a9cc7bcbc..8cfec7f76c 100644
--- a/plugins/Clist_modern/src/modern_extraimage.cpp
+++ b/plugins/Clist_modern/src/modern_extraimage.cpp
@@ -243,7 +243,7 @@ void ClearExtraIcons()
 {

 	SetNewExtraColumnCount();

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+	HANDLE hContact = db_find_first();

 	do {

 		HANDLE hItem = (HANDLE)SendMessage(pcli->hwndContactTree,CLM_FINDCONTACT,(WPARAM)hContact,0);

 		if (hItem == 0)

@@ -252,7 +252,7 @@ void ClearExtraIcons()
 		for (int i=0;i < EnabledColumnCount;i++)

 			SendMessage(pcli->hwndContactTree,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(i,0xFF));	

 	}

-		while(hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));

+		while(hContact = db_find_next(hContact));

 };

 

 void ExtraImage_SetAllExtraIcons(HWND hwndList,HANDLE hContact)

@@ -301,7 +301,7 @@ void ExtraImage_SetAllExtraIcons(HWND hwndList,HANDLE hContact)
 

 	if (hContact == NULL)

 	{

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+		hContact = db_find_first();

 	}	

 

 	do {

@@ -416,7 +416,7 @@ void ExtraImage_SetAllExtraIcons(HWND hwndList,HANDLE hContact)
 		NotifyEventHooks(g_CluiData.hEventExtraImageApplying,(WPARAM)hContact,0);

 		if (hcontgiven) break;

 		Sleep(0);

-	} while(hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));

+	} while(hContact = db_find_next(hContact));

 

 	tick = GetTickCount()-tick;

 	g_mutex_bSetAllExtraIconsCycle = 0;

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index ed156c8496..788ef91564 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -190,7 +190,7 @@ static void UpdateStickies()
 	int i;

 	HANDLE hItem;

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	while(hContact)

 	{

 		hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

@@ -198,7 +198,7 @@ static void UpdateStickies()
 			SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, (BYTE)db_get_dw(hContact, CLVM_MODULE, g_szModename, 0) ? 1 : 0);

 		localMask = HIWORD(db_get_dw(hContact, CLVM_MODULE, g_szModename, 0));

 		UpdateClistItem(hItem, (localMask == 0 || localMask == stickyStatusMask) ? stickyStatusMask : localMask);

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 

 	for (i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

@@ -479,7 +479,7 @@ void SaveState()
 			}

 

 			dwGlobalMask = GetMaskForItem(hInfoItem);

-			hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+			hContact = db_find_first();

 			while(hContact)

 			{

 				hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

@@ -497,7 +497,7 @@ void SaveState()
 							db_set_dw(hContact, CLVM_MODULE, szModeName, 0);

 					}

 				}

-				hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+				hContact = db_find_next(hContact);

 			}

 			operators |= ((SendDlgItemMessage(clvmHwnd, IDC_PROTOGROUPOP, CB_GETCURSEL, 0, 0) == 1 ? CLVM_PROTOGROUP_OP : 0) |

 				(SendDlgItemMessage(clvmHwnd, IDC_GROUPSTATUSOP, CB_GETCURSEL, 0, 0) == 1 ? CLVM_GROUPSTATUS_OP : 0) |

@@ -690,12 +690,12 @@ void DeleteViewMode( char * szName )
 		pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

 		SetWindowText(hwndSelector, TranslateT("All contacts"));

 	}

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	while(hContact)

 	{

 		if (db_get_dw(hContact, CLVM_MODULE, szName, -1) != -1)

 			db_set_dw(hContact, CLVM_MODULE, szName, 0);

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 }

 

@@ -893,14 +893,14 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		case IDC_CLEARALL:

 			{

 				HANDLE hItem;

-				HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+				HANDLE hContact = db_find_first();

 

 				while(hContact)

 				{

 					hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 					if (hItem)

 						SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 0);

-					hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+					hContact = db_find_next(hContact);

 				}

 			}

 		case IDOK: