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, 8 insertions, 8 deletions

diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
index 50e37ddc34..ce59001dda 100644
--- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp
+++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp
@@ -215,7 +215,7 @@ void SweepHistoryFromContact(HANDLE hContact, CriteriaStruct Criteria, BOOL keep
 void ShutdownAction(void)

 { 

 	CriteriaStruct Criteria;

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

+	HANDLE hContact = db_find_first();

 

 	Criteria.keep = KeepCriteria(DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0));

 	Criteria.time = BuildCriteria(DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0));

@@ -226,7 +226,7 @@ void ShutdownAction(void)
 	{

 		SweepHistoryFromContact(hContact, Criteria, TRUE);		// sweep contact history, keepunread==1

 

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);	// go to next contact

+		hContact = db_find_next(hContact);	// go to next contact

 	}

 }

 

diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp
index fdbb6f3cd3..64fcc8a4f3 100644
--- a/plugins/HistorySweeperLight/src/main.cpp
+++ b/plugins/HistorySweeperLight/src/main.cpp
@@ -78,7 +78,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 {

 	StatusIconData sid = {0};

 	int i, sweep = DBGetContactSettingByte(NULL, ModuleName, "SweepHistory", 0);

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

+	HANDLE hContact = db_find_first();

 

 	sid.cbSize = sizeof(sid);

 	sid.szModule = ModuleName;

@@ -136,7 +136,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 			CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);

 		}

 

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

+		hContact = db_find_next(hContact);

 	}

 

 	hHooks[2] = HookEvent(ME_MSG_WINDOWEVENT, OnWindowEvent);

diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp
index 2963f8bb2b..a49cf77684 100644
--- a/plugins/HistorySweeperLight/src/options.cpp
+++ b/plugins/HistorySweeperLight/src/options.cpp
@@ -133,8 +133,8 @@ static void ShowAllContactIcons(HWND hwndList)
 	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hSystemHistory, 

 											MAKELPARAM(0, DBGetContactSettingByte(NULL, ModuleName, "SweepSHistory", 0)));

 	

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

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

+	for (hContact=db_find_first(); hContact;

+											hContact=db_find_next(hContact))

 	{

 		hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, 

@@ -201,8 +201,8 @@ void SaveSettings(HWND hwndDlg)
 	DBWriteContactSettingByte(NULL, ModuleName, "SweepSHistory", 

 											(BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hSystemHistory, 0));

 	

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

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

+	for (hContact=db_find_first(); hContact;

+											hContact=db_find_next(hContact))

 	{

 		hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);