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
---
 plugins/TabSRMM/src/buttonsbar.cpp |  2 +-
 plugins/TabSRMM/src/chat/main.cpp  |  9 ++-------
 plugins/TabSRMM/src/msgdialog.cpp  |  2 +-
 plugins/TabSRMM/src/sendlater.cpp  | 11 ++---------
 4 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 36124651a1..18b2aa5846 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -611,7 +611,7 @@ INT_PTR CALLBACK DlgProcToolBar(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 
 		switch (LOWORD(wParam)) {
 		case IDC_BBRESET:
-			DbModule_Delete(NULL, "TabSRMM_Toolbar");
+			db_delete_module(NULL, "TabSRMM_Toolbar");
 			CB_HardReInit();
 			BuildMenuObjectsTree(hToolBarTree);
 			break;
diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index aa1d32a4fd..d1f8cb16e0 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -226,12 +226,7 @@ static void CheckUpdate()
 
 	if (compat == 0) {
 		LIST<char> szSettings(120);
-
-		DBCONTACTENUMSETTINGS dbces = { 0 };
-		dbces.szModule = CHAT_OLDFONTMODULE;
-		dbces.pfnEnumProc = CopyChatSetting;
-		dbces.lParam = (LPARAM)&szSettings;
-		CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
+		db_enum_settings(NULL, CopyChatSetting, CHAT_OLDFONTMODULE, &szSettings);
 
 		DBVARIANT dbv;
 		for (int i = szSettings.getCount() - 1; i >= 0; i--) {
@@ -242,7 +237,7 @@ static void CheckUpdate()
 			mir_free(p);
 		}
 
-		DbModule_Delete(NULL, CHAT_OLDFONTMODULE);
+		db_delete_module(NULL, CHAT_OLDFONTMODULE);
 		compat++;
 	}
 
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 87e0e8c979..afc2c235f6 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -3295,7 +3295,7 @@ quote_from_last:
 			dat->cache->setWindowData();
 			if (dat->cache->isValid() && !dat->fIsReattach && dat->hContact && M.GetByte("deletetemp", 0))
 				if (db_get_b(dat->hContact, "CList", "NotOnList", 0))
-					CallService(MS_DB_CONTACT_DELETE, dat->hContact, 0);
+					db_delete_contact(dat->hContact);
 
 			delete dat->Panel;
 			mir_free(dat);
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 97c12d1764..7415e54513 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -244,15 +244,8 @@ int _cdecl CSendLater::addStub(const char *szSetting, LPARAM lParam)
 void CSendLater::processSingleContact(const MCONTACT hContact)
 {
 	int iCount = db_get_dw(hContact, "SendLater", "count", 0);
-
-	if (iCount) {
-		DBCONTACTENUMSETTINGS ces = { 0 };
-		ces.pfnEnumProc = CSendLater::addStub;
-		ces.szModule = "SendLater";
-		ces.lParam = hContact;
-
-		CallService(MS_DB_CONTACT_ENUMSETTINGS, hContact, (LPARAM)&ces);
-	}
+	if (iCount)
+		db_enum_settings(hContact, CSendLater::addStub, "SendLater", (void*)hContact);
 }
 
 // called periodically from a timer, check if new contacts were added
-- 
cgit v1.2.3