From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 5 Apr 2013 22:27:16 +0000
Subject: - rest of menus cleared; - old database macroses wiped out from all
 plugins (left in m_database.h for compatibility)

git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/utils/openurl.cpp   |  2 +-
 src/modules/utils/path.cpp      |  2 +-
 src/modules/utils/timezones.cpp | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/utils')

diff --git a/src/modules/utils/openurl.cpp b/src/modules/utils/openurl.cpp
index 764169f268..70590c8ebf 100644
--- a/src/modules/utils/openurl.cpp
+++ b/src/modules/utils/openurl.cpp
@@ -56,7 +56,7 @@ static void OpenURLThread(void *arg)
 
 	// check user defined browser for opening urls
 	DBVARIANT dbv;
-	if (!DBGetContactSettingTString(NULL, "Miranda", "OpenUrlBrowser", &dbv)) {
+	if (!db_get_ts(NULL, "Miranda", "OpenUrlBrowser", &dbv)) {
 		ShellExecute(NULL, _T("open"), dbv.ptszVal, szResult, NULL, (hUrlInfo->newWindow) ? SW_NORMAL : SW_SHOWDEFAULT);
 		db_free(&dbv);
 	}
diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp
index 75fad634e8..40c591a1e4 100644
--- a/src/modules/utils/path.cpp
+++ b/src/modules/utils/path.cpp
@@ -70,7 +70,7 @@ TCHAR *GetContactID(HANDLE hContact)
 	char *szProto = GetContactProto(hContact);
 	if (db_get_b(hContact, szProto, "ChatRoom", 0) == 1) {
 		DBVARIANT dbv;
-		if ( !DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv)) {
+		if ( !db_get_ts(hContact, szProto, "ChatRoomID", &dbv)) {
 			theValue = (TCHAR *)mir_tstrdup(dbv.ptszVal);
 			db_free(&dbv);
 			return theValue;
diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp
index a22dd4ef26..8bcd80f4ac 100644
--- a/src/modules/utils/timezones.cpp
+++ b/src/modules/utils/timezones.cpp
@@ -199,7 +199,7 @@ static HANDLE timeapiGetInfoByContact(HANDLE hContact, DWORD dwFlags)
 		return (dwFlags & (TZF_DIFONLY | TZF_KNOWNONLY)) ? NULL : &myInfo.myTZ;
 
 	DBVARIANT dbv;
-	if ( !DBGetContactSettingTString(hContact, "UserInfo", "TzName", &dbv))
+	if ( !db_get_ts(hContact, "UserInfo", "TzName", &dbv))
 	{
 		HANDLE res = timeapiGetInfoByName(dbv.ptszVal, dwFlags);
 		db_free(&dbv);
@@ -210,7 +210,7 @@ static HANDLE timeapiGetInfoByContact(HANDLE hContact, DWORD dwFlags)
 	if (timezone == -1)
 	{
 		char* szProto = GetContactProto(hContact);
-		if ( !DBGetContactSettingTString(hContact, szProto, "TzName", &dbv))
+		if ( !db_get_ts(hContact, szProto, "TzName", &dbv))
 		{
 			HANDLE res = timeapiGetInfoByName(dbv.ptszVal, dwFlags);
 			db_free(&dbv);
@@ -265,8 +265,8 @@ static void timeapiSetInfoByContact(HANDLE hContact, HANDLE hTZ)
 	}
 	else
 	{
-		DBDeleteContactSetting(hContact, "UserInfo", "TzName");
-		DBDeleteContactSetting(hContact, "UserInfo", "Timezone");
+		db_unset(hContact, "UserInfo", "TzName");
+		db_unset(hContact, "UserInfo", "Timezone");
 	}
 }
 
@@ -391,7 +391,7 @@ static int timeapiSelectListItem(HANDLE hContact, HWND hWnd, DWORD dwFlags)
 	if (hContact)
 	{
 		DBVARIANT dbv;
-		if ( !DBGetContactSettingTString(hContact, "UserInfo", "TzName", &dbv))
+		if ( !db_get_ts(hContact, "UserInfo", "TzName", &dbv))
 		{
 			unsigned hash = mir_hashstrT(dbv.ptszVal);
 			for (int i=0; i < g_timezonesBias.getCount(); i++)
-- 
cgit v1.2.3