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

diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp
index a1d02df1b6..3f89da2e53 100755
--- a/plugins/New_GPG/src/icons.cpp
+++ b/plugins/New_GPG/src/icons.cpp
@@ -141,11 +141,11 @@ void RefreshContactListIcons()
 {

 	extern HANDLE g_hCLIcon;

 	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);

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

+	HANDLE hContact = db_find_first();

 	while (hContact) 

 	{

 		setClistIcon(hContact);

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

+		hContact = db_find_next(hContact);

 	}

 	CallService(MS_CLUI_LISTENDREBUILD,0,0);

 }

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index c091612d24..6d8956b219 100755
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -252,7 +252,7 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 extern list<wstring> transfers;

 extern "C" int __declspec(dllexport) Unload(void)

 {

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

+//	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 //		DBDeleteContactSetting(hContact, szGPGModuleName, "KeyID_Prescense");

 	if(!transfers.empty())

 	{

diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index 88b46459f3..e6e194c864 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -145,7 +145,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
 		int i = 1, iRow = 0;
 		bool isContactHaveKey(HANDLE);
-		for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact != NULL; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
+		for(HANDLE hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))
 		{
 			if(isContactHaveKey(hContact))
 			{
@@ -241,7 +241,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				  ismetacontact = true;
 			  }
 			  tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", "");
-			  for(HANDLE hcnttmp = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hcnttmp != NULL; hcnttmp = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hcnttmp, 0))
+			  for(HANDLE hcnttmp = db_find_first(); hcnttmp != NULL; hcnttmp = db_find_next(hcnttmp))
 			  {
 				  if(hcnttmp != hContact)
 				  {
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 8175917d05..e2841d6c85 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -1305,7 +1305,7 @@ INT_PTR ExportGpGKeys(WPARAM w, LPARAM l)
 	int exported_keys = 0;
 	if(!file.is_open())
 		return 1; //TODO: handle error
-	for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
+	for(HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
 	{
 		char *k = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", "");
 		if(!k[0])
@@ -1573,7 +1573,7 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l)
 			if(acc.length())
 			{
 				const char * uid = (const char*)CallProtoService(acc.c_str(), PS_GETCAPS,  (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
-				for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, (LPARAM)acc.c_str()); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, (LPARAM)acc.c_str()))
+				for(HANDLE hContact = db_find_first(acc.c_str()); hContact; hContact = db_find_next(hContact, acc.c_str()))
 				{
 					DBVARIANT dbv = {0};
 					DBCONTACTGETSETTING dbcgs = {0};