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
---
 plugins/RecentContacts/src/RecentContacts.cpp | 16 ++++++++--------
 plugins/RecentContacts/src/options.cpp        |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins/RecentContacts/src')

diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp
index 8099152f09..1952c4557a 100644
--- a/plugins/RecentContacts/src/RecentContacts.cpp
+++ b/plugins/RecentContacts/src/RecentContacts.cpp
@@ -59,15 +59,15 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 void LoadDBSettings()
 {
 	ZeroMemory(&LastUCOpt, sizeof(LastUCOpt));
-	LastUCOpt.MaxShownContacts = (INT)DBGetContactSettingByte( NULL, dbLastUC_ModuleName, dbLastUC_MaxShownContacts, 0 );
-	LastUCOpt.HideOffline = DBGetContactSettingByte( NULL, dbLastUC_ModuleName, dbLastUC_HideOfflineContacts, 0 );
+	LastUCOpt.MaxShownContacts = (INT)db_get_b( NULL, dbLastUC_ModuleName, dbLastUC_MaxShownContacts, 0 );
+	LastUCOpt.HideOffline = db_get_b( NULL, dbLastUC_ModuleName, dbLastUC_HideOfflineContacts, 0 );
 
 	DBVARIANT dbv;
 	dbv.type = DBVT_ASCIIZ;
 	dbv.pszVal = NULL;
 	if ( db_get(NULL, dbLastUC_ModuleName, dbLastUC_DateTimeFormat, &dbv) == 0 && dbv.pszVal[0]!=0 ) {
 		LastUCOpt.DateTimeFormat = dbv.pszVal;
-		DBFreeVariant(&dbv);
+		db_free(&dbv);
 	}
 	else LastUCOpt.DateTimeFormat = "(%Y-%m-%d %H:%M)  ";
 }
@@ -230,7 +230,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 			dbv.pszVal = NULL;
 			if (db_get(NULL, dbLastUC_ModuleName, dbLastUC_DateTimeFormat, &dbv) == 0) {
 				strtimformat = dbv.pszVal;
-				DBFreeVariant(&dbv);
+				db_free(&dbv);
 			}
 			else strtimformat = dbLastUC_DateTimeFormatDefault;
 
@@ -242,7 +242,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 
 					if (LastUCOpt.HideOffline == 1) {
 						szProto = GetContactProto(curContact->second);
-						if (szProto != NULL && DBGetContactSettingWord((HANDLE)curContact->second, szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)
+						if (szProto != NULL && db_get_w((HANDLE)curContact->second, szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)
 							continue;
 					}
 
@@ -486,7 +486,7 @@ static int OnPrebuildContactMenu (WPARAM wParam, LPARAM lParam)
 	CLISTMENUITEM clmi = { sizeof(clmi) };
 	clmi.flags = CMIM_NAME | CMIF_TCHAR;
 
-	if ( DBGetContactSettingByte((HANDLE)wParam, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0)
+	if ( db_get_b((HANDLE)wParam, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0)
 		clmi.ptszName = TranslateT("Ignore Contact");
 	else
 		clmi.ptszName = TranslateT("Show Contact");
@@ -518,8 +518,8 @@ INT_PTR ToggleIgnore (WPARAM wParam, LPARAM lParam)
 {
 	if (wParam != NULL) {
 		HANDLE hContact = ( HANDLE )wParam;
-		int state = DBGetContactSettingByte(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0 ? 1 : 0 ;
-		DBWriteContactSettingByte(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, state);
+		int state = db_get_b(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, 0) == 0 ? 1 : 0 ;
+		db_set_b(hContact, dbLastUC_ModuleName, dbLastUC_IgnoreContact, state);
 		return state;
 	}
 
diff --git a/plugins/RecentContacts/src/options.cpp b/plugins/RecentContacts/src/options.cpp
index e8dd226a37..4e082f85f0 100644
--- a/plugins/RecentContacts/src/options.cpp
+++ b/plugins/RecentContacts/src/options.cpp
@@ -39,14 +39,14 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				BOOL bSuccess = FALSE;
 
 				LastUCOpt.HideOffline = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE);
-				DBWriteContactSettingByte(NULL, dbLastUC_ModuleName, dbLastUC_HideOfflineContacts, (BYTE)LastUCOpt.HideOffline);
+				db_set_b(NULL, dbLastUC_ModuleName, dbLastUC_HideOfflineContacts, (BYTE)LastUCOpt.HideOffline);
 
 				GetDlgItemTextA(hwndDlg, IDC_SHOWNCONTACTS, str, SIZEOF(str));
 				LastUCOpt.MaxShownContacts= atoi(str);
-				DBWriteContactSettingByte(0,dbLastUC_ModuleName, dbLastUC_MaxShownContacts, LastUCOpt.MaxShownContacts);
+				db_set_b(0,dbLastUC_ModuleName, dbLastUC_MaxShownContacts, LastUCOpt.MaxShownContacts);
 
 				GetDlgItemTextA(hwndDlg, IDC_DATETIME, str, SIZEOF(str));
-				DBWriteContactSettingString(0,dbLastUC_ModuleName, dbLastUC_DateTimeFormat, str );
+				db_set_s(0,dbLastUC_ModuleName, dbLastUC_DateTimeFormat, str );
 
 				LoadDBSettings();
 				return TRUE;
-- 
cgit v1.2.3