From 7bdb598e26e7e98788933af43090d34027166969 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 14 Sep 2016 18:01:49 +0000
Subject: second major wipeout of database services & structures: -
 DBCONTACTENUMSETTINGS removed; - all helpers moved to mir_core.dll

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

(limited to 'protocols/Twitter')

diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index d5d56f9d85..2e28000c1f 100644
--- a/protocols/Twitter/src/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
@@ -240,7 +240,7 @@ MCONTACT TwitterProto::AddToClientList(const char *name, const char *status)
 		AddChatContact(name);
 
 	// If not, make a new contact!
-	hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
+	hContact = db_add_contact();
 	if (hContact) {
 		if (Proto_AddToContact(hContact, m_szModuleName) == 0) {
 			setString(hContact, TWITTER_KEY_UN, name);
@@ -258,7 +258,7 @@ MCONTACT TwitterProto::AddToClientList(const char *name, const char *status)
 
 			return hContact;
 		}
-		CallService(MS_DB_CONTACT_DELETE, hContact, 0);
+		db_delete_contact(hContact);
 	}
 
 	return 0;
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 763d269344..f44f1ce6b4 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -446,7 +446,7 @@ void TwitterProto::UpdateSettings()
 		for (MCONTACT hContact = db_find_first(m_szModuleName); hContact;) {
 			MCONTACT hNext = db_find_next(hContact, m_szModuleName);
 			if (isChatRoom(hContact))
-				CallService(MS_DB_CONTACT_DELETE, WPARAM(hContact), 0);
+				db_delete_contact(hContact);
 			hContact = hNext;
 		}
 	}
diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp
index f2bad47bed..f66d051a8c 100644
--- a/protocols/Twitter/src/ui.cpp
+++ b/protocols/Twitter/src/ui.cpp
@@ -318,8 +318,7 @@ namespace popup_options
 
 		// Pick a random contact
 		MCONTACT hContact = 0;
-		int n_contacts = (int)CallService(MS_DB_CONTACT_GETCOUNT, 0, 0);
-
+		int n_contacts = db_get_contact_count();
 		if (n_contacts != 0) {
 			int contact = rand() % n_contacts;
 			hContact = db_find_first();
-- 
cgit v1.2.3