From f90be5cdeec5875d1022e1ef35f5b101bd76ac84 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 10 Oct 2012 07:46:53 +0000
Subject: service call replaced with the direct function call

git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Twitter/chat.cpp     | 4 ++--
 protocols/Twitter/contacts.cpp | 8 ++++----
 protocols/Twitter/proto.cpp    | 4 ++--
 protocols/Twitter/ui.cpp       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'protocols/Twitter')

diff --git a/protocols/Twitter/chat.cpp b/protocols/Twitter/chat.cpp
index f73b885034..cafb46025c 100644
--- a/protocols/Twitter/chat.cpp
+++ b/protocols/Twitter/chat.cpp
@@ -197,9 +197,9 @@ void TwitterProto::SetChatStatus(int status)
 	if(status == ID_STATUS_ONLINE)
 	{
 		// Add all friends to contact list
-		for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+		for(HANDLE hContact = db_find_first();
 			hContact;
-			hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0))
+			hContact = db_find_next(hContact))
 		{
 			if(!IsMyContact(hContact))
 				continue;
diff --git a/protocols/Twitter/contacts.cpp b/protocols/Twitter/contacts.cpp
index ec75795694..78a53f47be 100644
--- a/protocols/Twitter/contacts.cpp
+++ b/protocols/Twitter/contacts.cpp
@@ -227,9 +227,9 @@ bool TwitterProto::IsMyContact(HANDLE hContact,bool include_chat)
 
 HANDLE TwitterProto::UsernameToHContact(const char *name)
 {
-	for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+	for(HANDLE hContact = db_find_first();
 		hContact;
-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0))
+		hContact = db_find_next(hContact))
 	{
 		if(!IsMyContact(hContact))
 			continue;
@@ -292,9 +292,9 @@ HANDLE TwitterProto::AddToClientList(const char *name,const char *status)
 
 void TwitterProto::SetAllContactStatuses(int status)
 {
-	for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+	for(HANDLE hContact = db_find_first();
 		hContact;
-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0))
+		hContact = db_find_next(hContact))
 	{
 		if(!IsMyContact(hContact))
 			continue;
diff --git a/protocols/Twitter/proto.cpp b/protocols/Twitter/proto.cpp
index 03949607ec..ae843d8b07 100644
--- a/protocols/Twitter/proto.cpp
+++ b/protocols/Twitter/proto.cpp
@@ -557,9 +557,9 @@ void TwitterProto::UpdateSettings()
 		if(in_chat_)
 			OnLeaveChat(0,0);
 
-		for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+		for(HANDLE hContact = db_find_first();
 			hContact;
-			hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0))
+			hContact = db_find_next(hContact))
 		{
 			if(!IsMyContact(hContact,true))
 				continue;
diff --git a/protocols/Twitter/ui.cpp b/protocols/Twitter/ui.cpp
index f5f571fdef..fa6899c13d 100644
--- a/protocols/Twitter/ui.cpp
+++ b/protocols/Twitter/ui.cpp
@@ -399,9 +399,9 @@ namespace popup_options
 		if(n_contacts != 0)
 		{
 			int contact = rand() % n_contacts;
-			hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);
+			hContact = db_find_first();
 			for(int i=0; i<contact; i++)
-				hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0);
+				hContact = db_find_next(hContact);
 		}
 
 		// Pick a random quote
-- 
cgit v1.2.3