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/Console/src/Console.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/Console/src')

diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp
index c53c5039db..50373a214f 100644
--- a/plugins/Console/src/Console.cpp
+++ b/plugins/Console/src/Console.cpp
@@ -161,7 +161,7 @@ static void ShowConsole(int show)
 			ScrollDown( pActive );
 	}
 	ShowWindow(hwndConsole, (show)?SW_SHOW:SW_HIDE);
-	DBWriteContactSettingByte(NULL,"Console","Show",(BYTE)((show)?1:0));
+	db_set_b(NULL,"Console","Show",(BYTE)((show)?1:0));
 
 	if (hwnd)
 		SetForegroundWindow(hwnd);
@@ -1005,14 +1005,14 @@ static int OnFastDump(WPARAM wParam,LPARAM lParam)
 
 static void LoadSettings()
 {
-	gIcons = DBGetContactSettingByte(NULL, "Console", "ShowIcons", 1);
-	gSeparator = DBGetContactSettingByte(NULL, "Console", "Separator", 1);
-	gSingleMode = DBGetContactSettingByte(NULL, "Console", "SingleMode", 0);
+	gIcons = db_get_b(NULL, "Console", "ShowIcons", 1);
+	gSeparator = db_get_b(NULL, "Console", "Separator", 1);
+	gSingleMode = db_get_b(NULL, "Console", "SingleMode", 0);
 
-	gWrapLen = DBGetContactSettingByte(NULL, "Console", "Wrap", DEFAULT_WRAPLEN);
+	gWrapLen = db_get_b(NULL, "Console", "Wrap", DEFAULT_WRAPLEN);
 	if ( gWrapLen < MIN_WRAPLEN ) gWrapLen = DEFAULT_WRAPLEN;
 
-	gLimit = DBGetContactSettingDword(NULL, "Console", "Limit", MAX_LIMIT);
+	gLimit = db_get_dw(NULL, "Console", "Limit", MAX_LIMIT);
 	if (gLimit > MAX_LIMIT) gLimit = MAX_LIMIT;
 	if (gLimit < MIN_LIMIT) gLimit = MIN_LIMIT;
 }
@@ -1029,7 +1029,7 @@ static void SaveSettings(HWND hwndDlg)
 
 	gWrapLen = len;
 	SetDlgItemInt(hwndDlg, IDC_WRAP, gWrapLen, FALSE);
-	DBWriteContactSettingByte(NULL, "Console", "Wrap", (BYTE)len);
+	db_set_b(NULL, "Console", "Wrap", (BYTE)len);
 
 	len = GetDlgItemInt(hwndDlg, IDC_LIMIT, NULL, FALSE);
 	if (len < MIN_LIMIT )
@@ -1040,13 +1040,13 @@ static void SaveSettings(HWND hwndDlg)
 
 	gLimit = len;
 	SetDlgItemInt(hwndDlg, IDC_LIMIT, gLimit, FALSE);
-	DBWriteContactSettingDword(NULL, "Console", "Limit", len);
+	db_set_dw(NULL, "Console", "Limit", len);
 
-	DBWriteContactSettingByte(NULL, "Console", "SingleMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SINGLE));
-	DBWriteContactSettingByte(NULL, "Console", "Separator", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATOR));
-	DBWriteContactSettingByte(NULL, "Console", "ShowIcons", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWICONS));
+	db_set_b(NULL, "Console", "SingleMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SINGLE));
+	db_set_b(NULL, "Console", "Separator", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATOR));
+	db_set_b(NULL, "Console", "ShowIcons", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWICONS));
 
-	DBWriteContactSettingByte(NULL, "Console", "ShowAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_START));
+	db_set_b(NULL, "Console", "ShowAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_START));
 }
 
 
@@ -1055,7 +1055,7 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 	switch(msg) {
 		case WM_INITDIALOG:
 			TranslateDialogDefault(hwndDlg);
-			CheckDlgButton(hwndDlg, IDC_START, DBGetContactSettingByte(NULL, "Console", "ShowAtStart", 0));
+			CheckDlgButton(hwndDlg, IDC_START, db_get_b(NULL, "Console", "ShowAtStart", 0));
 			CheckDlgButton(hwndDlg, IDC_SINGLE, gSingleMode);
 			CheckDlgButton(hwndDlg, IDC_SHOWICONS, gIcons);
 			CheckDlgButton(hwndDlg, IDC_SEPARATOR, gSeparator);
@@ -1230,7 +1230,7 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)
 		OnFontChange(0,0);
 		OnColourChange(0,0);
 
-		if (DBGetContactSettingByte(NULL,"Console","ShowAtStart",0) || DBGetContactSettingByte(NULL,"Console","Show",1))
+		if (db_get_b(NULL,"Console","ShowAtStart",0) || db_get_b(NULL,"Console","Show",1))
 			ShowConsole(1);
 		else
 			ShowConsole(0);
-- 
cgit v1.2.3