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/NotesAndReminders/src/notes.cpp     | 4 ++--
 plugins/NotesAndReminders/src/options.cpp   | 8 ++++----
 plugins/NotesAndReminders/src/reminders.cpp | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/NotesAndReminders/src')

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index efd0dc77df..58e809738e 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -695,7 +695,7 @@ void PurgeNotes(void)
 	for(I = 0; I < NotesCount; I++)
 	{
 		sprintf(ValueName, "NotesData%d", I);
-		DBDeleteContactSetting(0,MODULENAME,ValueName);
+		db_unset(0,MODULENAME,ValueName);
 	}
 }
 
@@ -957,7 +957,7 @@ static void JustSaveNotesEx(STICKYNOTE *pModified)
 	for(; I < OldNotesCount; I++)
 	{
 		sprintf(ValueName, "NotesData%d", I);
-		DBDeleteContactSetting(0,MODULENAME,ValueName);
+		db_unset(0,MODULENAME,ValueName);
 	}
 
 	NOTIFY_LIST();
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 3f3b889409..9ade55870f 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -216,7 +216,7 @@ static int FS_ColorChanged(WPARAM wParam, LPARAM lParam)
 	LoadNRFont(NR_FONTID_CAPTION, &lfCaption, (COLORREF*)&CaptionFontColor);
 	LoadNRFont(NR_FONTID_BODY, &lfBody, (COLORREF*)&BodyFontColor);
 
-	BodyColor = DBGetContactSettingDword(NULL, MODULENAME, colourOptionsList[0].szSettingName, colourOptionsList[0].defColour);
+	BodyColor = db_get_dw(NULL, MODULENAME, colourOptionsList[0].szSettingName, colourOptionsList[0].defColour);
 
 	SaveNotes();
 	LoadNotes(FALSE);
@@ -440,9 +440,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar
 			}
 			SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,g_lpszAltBrowser ? g_lpszAltBrowser : _T(""));
 			if (g_lpszAltBrowser)
-				DBWriteContactSettingString(0,MODULENAME,"AltBrowser",g_lpszAltBrowser);
+				db_set_s(0,MODULENAME,"AltBrowser",g_lpszAltBrowser);
 			else
-				DBDeleteContactSetting(0,MODULENAME,"AltBrowser");
+				db_unset(0,MODULENAME,"AltBrowser");
 
 			WriteSettingInt(0,MODULENAME,"ShowNotesAtStart",g_ShowNotesAtStart);
 			WriteSettingInt(0,MODULENAME,"ShowNoteButtons",g_ShowNoteButtons);
@@ -593,7 +593,7 @@ void InitSettings(void)
 	ReadSettingIntArray(0,MODULENAME,"NotesListGeom",g_notesListGeom,SIZEOF(g_notesListGeom));
 	ReadSettingIntArray(0,MODULENAME,"NotesListColGeom",g_notesListColGeom,SIZEOF(g_notesListColGeom));
 
-	BodyColor = DBGetContactSettingDword(NULL, MODULENAME, colourOptionsList[0].szSettingName, colourOptionsList[0].defColour);
+	BodyColor = db_get_dw(NULL, MODULENAME, colourOptionsList[0].szSettingName, colourOptionsList[0].defColour);
 
 	InitFonts();
 
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 82f4d1aece..234aea3e6e 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -459,7 +459,7 @@ void JustSaveReminders(void)
 	for(; I < OldReminderCount; I++)
 	{
 		sprintf(ValueName, "RemindersData%d", I);
-		DBDeleteContactSetting(0,MODULENAME,ValueName);
+		db_unset(0,MODULENAME,ValueName);
 	}
 }
 
@@ -852,10 +852,10 @@ static void SkinPlaySoundPoly(LPCSTR pszSoundName)
 		return;
 	}
 
-	if (DBGetContactSettingByte(NULL, "SkinSoundsOff", pszSoundName, 0)==0) {
+	if (db_get_b(NULL, "SkinSoundsOff", pszSoundName, 0)==0) {
 		DBVARIANT dbv;
 
-		if (DBGetContactSettingString(NULL, "SkinSounds", pszSoundName, &dbv)==0) {
+		if (db_get_s(NULL, "SkinSounds", pszSoundName, &dbv)==0) {
 			char szFull[MAX_PATH];
 
 			PathToAbsolute(dbv.pszVal, szFull);
@@ -871,7 +871,7 @@ static void SkinPlaySoundPoly(LPCSTR pszSoundName)
 				mciSendStringA(s, NULL, 0, NULL);
 			}
 
-			DBFreeVariant(&dbv);
+			db_free(&dbv);
 		}
 	}
 }
-- 
cgit v1.2.3