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

diff --git a/protocols/Gadu-Gadu/core.cpp b/protocols/Gadu-Gadu/core.cpp
index 48662e00df..63d5d37b24 100644
--- a/protocols/Gadu-Gadu/core.cpp
+++ b/protocols/Gadu-Gadu/core.cpp
@@ -1354,7 +1354,7 @@ void GGPROTO::setalloffline()
 {

 	netlog("gg_setalloffline(): Setting buddies offline");

 	db_set_w(NULL, m_szModuleName, GG_KEY_STATUS, ID_STATUS_OFFLINE);

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

+	HANDLE hContact = db_find_first();

 	while (hContact)

 	{

 		char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

@@ -1367,7 +1367,7 @@ void GGPROTO::setalloffline()
 			// Delete status descr

 			db_unset(hContact, "CList", GG_KEY_STATUSDESCR);

 		}

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

+		hContact = db_find_next(hContact);

 	}

 #ifdef DEBUGMODE

 	netlog("gg_setalloffline(): End");

@@ -1424,12 +1424,12 @@ void GGPROTO::notifyall()
 

 	netlog("gg_notifyall(): Subscribing notification to all users");

 	// Readup count

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

+	hContact = db_find_first();

 	while (hContact)

 	{

 		szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

 		if (szProto != NULL && !strcmp(szProto, m_szModuleName)) count ++;

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

+		hContact = db_find_next(hContact);

 	}

 

 	// Readup list

@@ -1447,7 +1447,7 @@ void GGPROTO::notifyall()
 	uins = (uin_t*)calloc(sizeof(uin_t), count);

 	types = (char*)calloc(sizeof(char), count);

 

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

+	hContact = db_find_first();

 	while (hContact && cc < count)

 	{

 		szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

@@ -1462,7 +1462,7 @@ void GGPROTO::notifyall()
 				types[cc] = GG_USER_NORMAL;

 			cc ++;

 		}

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

+		hContact = db_find_next(hContact);

 	}

 	if (cc < count) count = cc;

 

@@ -1484,7 +1484,7 @@ void GGPROTO::notifyall()
 HANDLE GGPROTO::getcontact(uin_t uin, int create, int inlist, TCHAR *szNick)

 {

 	// Look for contact in DB

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

+	HANDLE hContact = db_find_first();

 	while (hContact) {

 		char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

 		if (szProto != NULL && !strcmp(szProto, m_szModuleName)) {

@@ -1498,7 +1498,7 @@ HANDLE GGPROTO::getcontact(uin_t uin, int create, int inlist, TCHAR *szNick)
 				return hContact;

 			}

 		}

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

+		hContact = db_find_next(hContact);

 	}

 	if (!create) return NULL;

 

diff --git a/protocols/Gadu-Gadu/gg.cpp b/protocols/Gadu-Gadu/gg.cpp
index 3ac4c54871..5bd9f6ceb5 100644
--- a/protocols/Gadu-Gadu/gg.cpp
+++ b/protocols/Gadu-Gadu/gg.cpp
@@ -157,7 +157,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 		netlog("gg_cleanuplastplugin(%d): Cleaning junk Phone settings from < 0.0.1.4 ...", version);

 #endif

 		// Look for contact in DB

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

+		hContact = db_find_first();

 		while (hContact)

 		{

 			szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

@@ -167,7 +167,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 				db_unset(hContact, m_szModuleName, GG_KEY_EMAIL);

 				db_unset(hContact, m_szModuleName, "Phone");

 			}

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

+			hContact = db_find_next(hContact);

 		}

 	}

 

@@ -178,7 +178,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 		netlog("gg_cleanuplastplugin(%d): Cleaning junk Nick settings from < 0.0.3.5 ...", version);

 #endif

 		// Look for contact in DB

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

+		hContact = db_find_first();

 		while (hContact)

 		{

 			szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

@@ -187,7 +187,7 @@ void GGPROTO::cleanuplastplugin(DWORD version)
 				// Do nick entry cleanup

 				db_unset(hContact, m_szModuleName, GG_KEY_NICK);

 			}

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

+			hContact = db_find_next(hContact);

 		}

 	}

 

diff --git a/protocols/Gadu-Gadu/groupchat.cpp b/protocols/Gadu-Gadu/groupchat.cpp
index df45da9ea4..4089c8fac3 100644
--- a/protocols/Gadu-Gadu/groupchat.cpp
+++ b/protocols/Gadu-Gadu/groupchat.cpp
@@ -145,7 +145,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam)
 		free(chat->recipients);

 		list_remove(&chats, chat, 1);

 		// Remove contact from contact list (duh!) should be done by chat.dll !!

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

+		hContact = db_find_first();

 		while (hContact)

 		{

 			DBVARIANT dbv;

@@ -155,7 +155,7 @@ int GGPROTO::gc_event(WPARAM wParam, LPARAM lParam)
 					CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

 				DBFreeVariant(&dbv);

 			}

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

+			hContact = db_find_next(hContact);

 		}

 		return 1;

 	}

@@ -422,13 +422,13 @@ static void gg_gc_resetclistopts(HWND hwndList)
 static int gg_gc_countcheckmarks(HWND hwndList)

 {

 	int count = 0;

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

+	HANDLE hItem, hContact = db_find_first();

 	while (hContact)

 	{

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

 		if (hItem && SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0))

 			count++;

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

+		hContact = db_find_next(hContact);

 	}

 	return count;

 }

@@ -476,7 +476,7 @@ static INT_PTR CALLBACK gg_gc_openconfdlg(HWND hwndDlg, UINT message, WPARAM wPa
 						// Create new participiants table

 						char* chat;

 						uin_t* participants = (uin_t*)calloc(count, sizeof(uin_t));

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

+						HANDLE hItem, hContact = db_find_first();

 						gg->netlog("gg_gc_getchat(): Opening new conference for %d contacts.", count);

 						while (hContact && i < count)

 						{

@@ -486,7 +486,7 @@ static INT_PTR CALLBACK gg_gc_openconfdlg(HWND hwndDlg, UINT message, WPARAM wPa
 								HANDLE hMetaContact = gg_getsubcontact(gg, hContact); // MetaContacts support

 								participants[i++] = db_get_dw(hMetaContact ? hMetaContact : hContact, gg->m_szModuleName, GG_KEY_UIN, 0);

 							}

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

+							hContact = db_find_next(hContact);

 						}

 						if (count > i) i = count;

 						chat = gg->gc_getchat(0, participants, count);

@@ -532,7 +532,7 @@ static INT_PTR CALLBACK gg_gc_openconfdlg(HWND hwndDlg, UINT message, WPARAM wPa
 							if (!gg) break;

 

 							// Delete non-gg contacts

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

+							hContact = db_find_first();

 							while (hContact)

 							{

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

@@ -553,7 +553,7 @@ static INT_PTR CALLBACK gg_gc_openconfdlg(HWND hwndDlg, UINT message, WPARAM wPa
 									if (szProto == NULL || lstrcmpA(szProto, gg->m_szModuleName) || !uin || uin == db_get_dw(NULL, gg->m_szModuleName, GG_KEY_UIN, 0))

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

 								}

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

+								hContact = db_find_next(hContact);

 							}

 						}

 						break;

diff --git a/protocols/Gadu-Gadu/import.cpp b/protocols/Gadu-Gadu/import.cpp
index 8c81e1140f..e4ff066d11 100644
--- a/protocols/Gadu-Gadu/import.cpp
+++ b/protocols/Gadu-Gadu/import.cpp
@@ -101,7 +101,7 @@ char *gg_makecontacts(GGPROTO *gg, int cr)
 	char *contacts;

 

 	// Readup contacts

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

+	HANDLE hContact = db_find_first();

 	while (hContact)

 	{

 		char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

@@ -175,7 +175,7 @@ char *gg_makecontacts(GGPROTO *gg, int cr)
 			else

 				string_append(s, ";0;;0;\n");

 		}

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

+		hContact = db_find_next(hContact);

 	}

 

 	contacts = string_free(s, 0);