From f51995e13679a37851baef8e7f52f2d993cbc7c1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 13 Sep 2016 17:11:58 +0000
Subject: mode old database junk to die

git-svn-id: http://svn.miranda-ng.org/main/trunk@17291 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/modern_clui.cpp       | 4 ++--
 plugins/Clist_modern/src/modern_skinengine.cpp | 6 +++---
 plugins/Clist_modern/src/modern_toolbar.cpp    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Clist_modern/src')

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 58903af561..6c0e1af226 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -1560,8 +1560,8 @@ LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bH
 			hView = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, MAX_PATH);
 			if (hView) {
 				char szFilePath[MAX_PATH], szProfile[MAX_PATH];
-				CallService(MS_DB_GETPROFILEPATH, MAX_PATH, (LPARAM)&szFilePath);
-				CallService(MS_DB_GETPROFILENAME, MAX_PATH, (LPARAM)&szProfile);
+				Profile_GetPathA(MAX_PATH, szFilePath);
+				Profile_GetNameA(MAX_PATH, szProfile);
 				mir_snprintf((char*)hView, MAX_PATH, "%s\\%s", szFilePath, szProfile);
 				UnmapViewOfFile(hView);
 				rc = 1;
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index 167a0a8d07..5131e493ca 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -1948,7 +1948,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()) {
-		CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)"ModernSkin");
+		DbModule_Delete(0, "ModernSkin");
 		db_set_s(NULL, SKIN, "SkinFolder", "%Default%");
 		db_set_s(NULL, SKIN, "SkinFile", "%Default%");
 		parser.Parse(IniParser::WriteStrToDb, 0);
@@ -1966,7 +1966,7 @@ int ske_LoadSkinFromIniFile(wchar_t *szFileName, BOOL bOnlyObjects)
 	if (!parser.CheckOK())
 		return 0;
 
-	CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)"ModernSkin");
+	DbModule_Delete(0, "ModernSkin");
 
 	wchar_t skinFolder[MAX_PATH], skinFile[MAX_PATH];
 	IniParser::GetSkinFolder(szFileName, skinFolder);
@@ -3314,7 +3314,7 @@ wchar_t* ske_ReplaceVar(wchar_t *var)
 	if (!var) return mir_wstrdup(L"");
 	if (!mir_wstrcmpi(var, L"Profile")) {
 		char buf[MAX_PATH] = { 0 };
-		CallService(MS_DB_GETPROFILENAME, (WPARAM)MAX_PATH, (LPARAM)buf);
+		Profile_GetNameA(MAX_PATH, buf);
 
 		char *p = strrchr(buf, '.');
 		if (p) *p = 0;
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index b31609f534..efced1370b 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");
 
-			CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)"ModernToolBar");
+			DbModule_Delete(0, "ModernToolBar");
 		}
 		db_set_b(NULL, "Compatibility", "TTB_Upgrade", 1);
 	}
-- 
cgit v1.2.3