service call replaced with the direct function call

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

4 files changed, 18 insertions, 18 deletions

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index fb2ac94c3f..7bc8154533 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -201,7 +201,7 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat)
 		}

 	}

 

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

+	hContact = db_find_first();

 	while (hContact) {

 		if (style & CLS_SHOWHIDDEN || !CLVM_GetContactHiddenStatus(hContact, NULL, dat)) {

 			ZeroMemory((void *)&dbv, sizeof(dbv));

@@ -225,7 +225,7 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat)
 					AddContactToGroup(dat, group, hContact);

 			}

 		}

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

+		hContact = db_find_next(hContact);

 	}

 

 	if (style & CLS_HIDEEMPTYGROUPS) {

diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index 25ac81aaec..ef614af287 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -123,13 +123,13 @@ DWORD WINAPI MF_UpdateThread(LPVOID p)
     ResetEvent(hEvent);

 

     while(mf_updatethread_running) {

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

+        hContact = db_find_first();

         while (hContact != NULL && mf_updatethread_running) {

             MF_CalcFrequency(hContact, 50, 1);

             if (mf_updatethread_running)

                 WaitForSingleObject(hEvent, 5000);

             ResetEvent(hEvent);

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

+            hContact = db_find_next(hContact);

         }

         if (mf_updatethread_running)

             WaitForSingleObject(hEvent, 1000000);

@@ -157,7 +157,7 @@ void LoadContactTree(void)
     }

 

     hideOffline = cfg::getByte("CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

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

+    hContact = db_find_first();

     while (hContact != NULL) {

         status = GetContactStatus(hContact);

         if ((!hideOffline || status != ID_STATUS_OFFLINE) && !CLVM_GetContactHiddenStatus(hContact, NULL, NULL))

@@ -175,7 +175,7 @@ void LoadContactTree(void)
         if (!bMsgFrequency)

             MF_CalcFrequency(hContact, 100, 0);

 

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

+        hContact = db_find_next(hContact);

     }

     cfg::writeByte("CList", "fhistdata", 1);

     mc_hgh_removed = TRUE;

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 3b5eda0220..42767f9ad6 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1324,7 +1324,7 @@ void LoadPerContactSkins(TCHAR *tszFileName)
 	}

 

 	if (items) {

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

+		hContact = db_find_first();

 		while(hContact) {

 			char UIN[40];

 			int j;

@@ -1380,7 +1380,7 @@ void LoadPerContactSkins(TCHAR *tszFileName)
 					}

 				}

 			}

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

+			hContact = db_find_next(hContact);

 		}

 	}

 	free(szSections);

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 68608b67c3..17ee84f07a 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -150,7 +150,7 @@ static DWORD GetMaskForItem(HANDLE hItem)
 

 static void UpdateStickies()

 {

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

+    HANDLE hContact = db_find_first();

     HANDLE hItem;

     DWORD localMask;

     int i;

@@ -161,7 +161,7 @@ static void UpdateStickies()
             SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, cfg::getByte(hContact, "CLVM", g_szModename, 0) ? 1 : 0);

         localMask = HIWORD(cfg::getDword(hContact, "CLVM", 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);

     }

 

     {

@@ -424,7 +424,7 @@ void SaveState()
             //    GetDlgItemTextA(clvmHwnd, IDC_VARIABLES, vastring, len);

             SendDlgItemMessageA(clvmHwnd, IDC_VIEWMODES, LB_GETTEXT, clvm_curItem, (LPARAM)szModeName);

             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);

                 if (hItem) {

@@ -438,7 +438,7 @@ void SaveState()
                         	cfg::writeDword(hContact, "CLVM", 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) |

@@ -708,11 +708,11 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
                                     pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

                                     SetWindowTextA(hwndSelector, Translate("No view mode"));

                                 }

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

+                                hContact = db_find_first();

                                 while(hContact) {

                                     if (cfg::getDword(hContact, "CLVM", szBuf, -1) != -1)

                                     	cfg::writeDword(hContact, "CLVM", szBuf, 0);

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

+                                    hContact = db_find_next(hContact);

                                 }

                                 SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_DELETESTRING, SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_GETCURSEL, 0, 0), 0);

                                 if (SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_SETCURSEL, 0, 0) != LB_ERR) {

@@ -757,13 +757,13 @@ 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:

@@ -1147,7 +1147,7 @@ void ApplyViewMode(const char *name)
             g_CluiData.bFilterEffective |= CLVM_FILTER_VARIABLES;

         mir_free(dbv.ptszVal);

         if (g_CluiData.bFilterEffective & CLVM_FILTER_VARIABLES) {

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

+            HANDLE hContact = db_find_first();

             char UIN[256];

             char *id, *szProto;

             const char *varstring;

@@ -1180,7 +1180,7 @@ void ApplyViewMode(const char *name)
                         }

                     }

                 }

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

+                hContact = db_find_next(hContact);

             }

         }

     }*/