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/Clist_modern/src/modern_clc.cpp         |  2 +-
 plugins/Clist_modern/src/modern_skinengine.cpp  | 10 +++-------
 plugins/Clist_modern/src/modern_toolbar.cpp     |  2 +-
 plugins/Clist_modern/src/modern_viewmodebar.cpp |  7 +------
 4 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'plugins/Clist_modern')

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 683f0bd7d4..6d5f29ad3f 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1345,7 +1345,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam
 	ClcGroup *group = NULL;
 	ClcContact *contact = NULL;
 	if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL)) {
-		if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) {
+		if (shouldShow && db_is_contact(wParam)) {
 			if (dat->selection >= 0 && pcli->pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1)
 				hSelItem = Clist_ContactToHItem(selcontact);
 			pcli->pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0);
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 5131e493ca..efe7ff5ba1 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -1923,12 +1923,8 @@ static int ske_GetSkinFromDB(char *, SKINOBJECTSLIST *Skin)
 	}
 
 	// Load objects
-	DBCONTACTENUMSETTINGS dbces;
 	pCurrentSkin = Skin;
-	dbces.pfnEnumProc = ske_enumdb_SkinObjectsProc;
-	dbces.szModule = SKIN;
-	dbces.ofsSettings = 0;
-	CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
+	db_enum_settings(NULL, ske_enumdb_SkinObjectsProc, SKIN);
 
 	SortMaskList(pCurrentSkin->pMaskList);
 	ske_LinkSkinObjects(pCurrentSkin);
@@ -1948,7 +1944,7 @@ static int ske_LoadSkinFromResource(BOOL bOnlyObjects)
 {
 	IniParser parser(g_hInst, MAKEINTRESOURCEA(IDR_MSF_DEFAULT_SKIN), "MSF", bOnlyObjects ? IniParser::FLAG_ONLY_OBJECTS : IniParser::FLAG_WITH_SETTINGS);
 	if (parser.CheckOK()) {
-		DbModule_Delete(0, "ModernSkin");
+		db_delete_module(0, "ModernSkin");
 		db_set_s(NULL, SKIN, "SkinFolder", "%Default%");
 		db_set_s(NULL, SKIN, "SkinFile", "%Default%");
 		parser.Parse(IniParser::WriteStrToDb, 0);
@@ -1966,7 +1962,7 @@ int ske_LoadSkinFromIniFile(wchar_t *szFileName, BOOL bOnlyObjects)
 	if (!parser.CheckOK())
 		return 0;
 
-	DbModule_Delete(0, "ModernSkin");
+	db_delete_module(0, "ModernSkin");
 
 	wchar_t skinFolder[MAX_PATH], skinFile[MAX_PATH];
 	IniParser::GetSkinFolder(szFileName, skinFolder);
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index efced1370b..c4f96d36b8 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -338,7 +338,7 @@ static int Toolbar_ModulesLoaded(WPARAM, LPARAM)
 
 			db_unset(NULL, "CLUI", "ShowButtonBar");
 
-			DbModule_Delete(0, "ModernToolBar");
+			db_delete_module(0, "ModernToolBar");
 		}
 		db_set_b(NULL, "Compatibility", "TTB_Upgrade", 1);
 	}
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 0858bcbe5f..c298d85e96 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -101,12 +101,7 @@ int CLVM_EnumProc(const char *szSetting, LPARAM lParam)
 
 void CLVM_EnumModes(pfnEnumCallback EnumCallback)
 {
-	DBCONTACTENUMSETTINGS dbces;
-	dbces.pfnEnumProc = CLVM_EnumProc;
-	dbces.szModule = CLVM_MODULE;
-	dbces.ofsSettings = 0;
-	dbces.lParam = (LPARAM)EnumCallback;
-	CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
+	db_enum_settings(NULL, CLVM_EnumProc, CLVM_MODULE, EnumCallback);
 }
 
 int FillModes(char *szsetting)
-- 
cgit v1.2.3