From 53fe3e46177d17b4941610de19f5cc6210700cb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 12 Nov 2018 21:44:56 +0300 Subject: db_* functions replaced with g_plugin calls --- plugins/NotesAndReminders/src/main.cpp | 2 +- plugins/NotesAndReminders/src/notes.cpp | 14 ++++---- plugins/NotesAndReminders/src/options.cpp | 56 ++++++++++++++--------------- plugins/NotesAndReminders/src/reminders.cpp | 18 +++++----- 4 files changed, 45 insertions(+), 45 deletions(-) (limited to 'plugins/NotesAndReminders/src') diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 317127c8b7..66f764a94f 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -187,7 +187,7 @@ int OnModulesLoaded(WPARAM, LPARAM) RegisterFontServiceFonts(); RegisterKeyBindings(); - g_AddContListMI = (BOOL)db_get_dw(0, MODULENAME, "AddContactMenuItems", 1); + g_AddContListMI = (BOOL)g_plugin.getDword("AddContactMenuItems", 1); // register menus CMenuItem mi(&g_plugin); diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp index 1f843c520c..493d47c6ee 100644 --- a/plugins/NotesAndReminders/src/notes.cpp +++ b/plugins/NotesAndReminders/src/notes.cpp @@ -334,7 +334,7 @@ void LoadNotes(BOOL bIsStartup) g_Stickies = nullptr; - int NotesCount = db_get_dw(0, MODULENAME, "NotesData", 0); + int NotesCount = g_plugin.getDword("NotesData", 0); for (int I = 0; I < NotesCount; I++) { char *DelPos; @@ -625,17 +625,17 @@ void PurgeNotes(void) { char ValueName[16]; - int NotesCount = db_get_dw(0, MODULENAME, "NotesData", 0); + int NotesCount = g_plugin.getDword("NotesData", 0); for (int I = 0; I < NotesCount; I++) { mir_snprintf(ValueName, "NotesData%d", I); - db_unset(0, MODULENAME, ValueName); + g_plugin.delSetting(ValueName); } } void DeleteNotes(void) { PurgeNotes(); - db_set_dw(0, MODULENAME, "NotesData", 0); + g_plugin.setDword("NotesData", 0); PurgeNotesTree(); NOTIFY_LIST(); } @@ -679,9 +679,9 @@ static void JustSaveNotesEx(STICKYNOTE *pModified = nullptr) int scrollV; char *tData; - const int OldNotesCount = db_get_dw(0, MODULENAME, "NotesData", 0); + const int OldNotesCount = g_plugin.getDword("NotesData", 0); - db_set_dw(0, MODULENAME, "NotesData", NotesCount); + g_plugin.setDword("NotesData", NotesCount); for (TREEELEMENT *TTE = g_Stickies; TTE; TTE = (TREEELEMENT*)TTE->next, I++) { STICKYNOTE *pNote = (STICKYNOTE*)TTE->ptrdata; @@ -798,7 +798,7 @@ static void JustSaveNotesEx(STICKYNOTE *pModified = nullptr) // delete any left over DB note entries for (; I < OldNotesCount; I++) { mir_snprintf(ValueName, "NotesData%d", I); - db_unset(0, MODULENAME, ValueName); + g_plugin.delSetting(ValueName); } NOTIFY_LIST(); diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp index 6e87a570be..c088db9257 100644 --- a/plugins/NotesAndReminders/src/options.cpp +++ b/plugins/NotesAndReminders/src/options.cpp @@ -211,7 +211,7 @@ static int FS_ColorChanged(WPARAM, LPARAM) LoadNRFont(NR_FONTID_CAPTION, &lfCaption, (COLORREF*)&CaptionFontColor); LoadNRFont(NR_FONTID_BODY, &lfBody, (COLORREF*)&BodyFontColor); - BodyColor = db_get_dw(NULL, MODULENAME, colourOptionsList[0].szSettingName, colourOptionsList[0].defColour); + BodyColor = g_plugin.getDword(colourOptionsList[0].szSettingName, colourOptionsList[0].defColour); SaveNotes(); LoadNotes(FALSE); @@ -399,21 +399,21 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg, UINT message, WPARAM wParam, LPARAM l } SetDlgItemText(hdlg, IDC_EDIT_ALTBROWSER, g_lpszAltBrowser ? g_lpszAltBrowser : ""); if (g_lpszAltBrowser) - db_set_s(0, MODULENAME, "AltBrowser", g_lpszAltBrowser); + g_plugin.setString("AltBrowser", g_lpszAltBrowser); else - db_unset(0, MODULENAME, "AltBrowser"); - - db_set_dw(0, MODULENAME, "ShowNotesAtStart", g_ShowNotesAtStart); - db_set_dw(0, MODULENAME, "ShowNoteButtons", g_ShowNoteButtons); - db_set_dw(0, MODULENAME, "ShowScrollbar", g_ShowScrollbar); - db_set_dw(0, MODULENAME, "AddContactMenuItems", g_AddContListMI); - db_set_dw(0, MODULENAME, "NoteWidth", g_NoteWidth); - db_set_dw(0, MODULENAME, "NoteHeight", g_NoteHeight); - db_set_dw(0, MODULENAME, "Transparency", g_Transparency); - db_set_dw(0, MODULENAME, "NoteTitleDate", g_NoteTitleDate); - db_set_dw(0, MODULENAME, "NoteTitleTime", g_NoteTitleTime); - db_set_dw(0, MODULENAME, "CloseAfterAddReminder", g_CloseAfterAddReminder); - db_set_dw(0, MODULENAME, "UseMCI", !g_UseDefaultPlaySound); + g_plugin.delSetting("AltBrowser"); + + g_plugin.setDword("ShowNotesAtStart", g_ShowNotesAtStart); + g_plugin.setDword("ShowNoteButtons", g_ShowNoteButtons); + g_plugin.setDword("ShowScrollbar", g_ShowScrollbar); + g_plugin.setDword("AddContactMenuItems", g_AddContListMI); + g_plugin.setDword("NoteWidth", g_NoteWidth); + g_plugin.setDword("NoteHeight", g_NoteHeight); + g_plugin.setDword("Transparency", g_Transparency); + g_plugin.setDword("NoteTitleDate", g_NoteTitleDate); + g_plugin.setDword("NoteTitleTime", g_NoteTitleTime); + g_plugin.setDword("CloseAfterAddReminder", g_CloseAfterAddReminder); + g_plugin.setDword("UseMCI", !g_UseDefaultPlaySound); SaveNotes(); LoadNotes(FALSE); return TRUE; @@ -521,26 +521,26 @@ void InitSettings(void) FreeSettingBlob(Sz1, P); } - g_lpszAltBrowser = db_get_sa(0, MODULENAME, "AltBrowser"); + g_lpszAltBrowser = g_plugin.getStringA("AltBrowser"); - g_ShowNotesAtStart = (BOOL)db_get_dw(0, MODULENAME, "ShowNotesAtStart", 1); - g_ShowNoteButtons = (BOOL)db_get_dw(0, MODULENAME, "ShowNoteButtons", 1); - g_ShowScrollbar = (BOOL)db_get_dw(0, MODULENAME, "ShowScrollbar", 1); - g_AddContListMI = (BOOL)db_get_dw(0, MODULENAME, "AddContactMenuItems", 1); - g_NoteWidth = db_get_dw(0, MODULENAME, "NoteWidth", 179); - g_NoteHeight = db_get_dw(0, MODULENAME, "NoteHeight", 50); - g_Transparency = db_get_dw(0, MODULENAME, "Transparency", 255); - g_NoteTitleDate = db_get_dw(0, MODULENAME, "NoteTitleDate", 1); - g_NoteTitleTime = db_get_dw(0, MODULENAME, "NoteTitleTime", 1); - g_CloseAfterAddReminder = (BOOL)db_get_dw(0, MODULENAME, "CloseAfterAddReminder", 1); - g_UseDefaultPlaySound = !(BOOL)db_get_dw(0, MODULENAME, "UseMCI", 1); + g_ShowNotesAtStart = (BOOL)g_plugin.getDword("ShowNotesAtStart", 1); + g_ShowNoteButtons = (BOOL)g_plugin.getDword("ShowNoteButtons", 1); + g_ShowScrollbar = (BOOL)g_plugin.getDword("ShowScrollbar", 1); + g_AddContListMI = (BOOL)g_plugin.getDword("AddContactMenuItems", 1); + g_NoteWidth = g_plugin.getDword("NoteWidth", 179); + g_NoteHeight = g_plugin.getDword("NoteHeight", 50); + g_Transparency = g_plugin.getDword("Transparency", 255); + g_NoteTitleDate = g_plugin.getDword("NoteTitleDate", 1); + g_NoteTitleTime = g_plugin.getDword("NoteTitleTime", 1); + g_CloseAfterAddReminder = (BOOL)g_plugin.getDword("CloseAfterAddReminder", 1); + g_UseDefaultPlaySound = !(BOOL)g_plugin.getDword("UseMCI", 1); ReadSettingIntArray(0, MODULENAME, "ReminderListGeom", g_reminderListGeom, _countof(g_reminderListGeom)); ReadSettingIntArray(0, MODULENAME, "ReminderListColGeom", g_reminderListColGeom, _countof(g_reminderListColGeom)); ReadSettingIntArray(0, MODULENAME, "NotesListGeom", g_notesListGeom, _countof(g_notesListGeom)); ReadSettingIntArray(0, MODULENAME, "NotesListColGeom", g_notesListColGeom, _countof(g_notesListColGeom)); - BodyColor = db_get_dw(NULL, MODULENAME, colourOptionsList[0].szSettingName, colourOptionsList[0].defColour); + BodyColor = g_plugin.getDword(colourOptionsList[0].szSettingName, colourOptionsList[0].defColour); InitFonts(); diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 5f8b9b7fc6..e8a021da1d 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -160,10 +160,10 @@ void PurgeReminders(void) { char ValueName[32]; - int ReminderCount = db_get_dw(0, MODULENAME, "RemindersData", 0); + int ReminderCount = g_plugin.getDword("RemindersData", 0); for (int I = 0; I < ReminderCount; I++) { mir_snprintf(ValueName, "RemindersData%d", I); - db_unset(0, MODULENAME, ValueName); + g_plugin.delSetting(ValueName); } } @@ -174,11 +174,11 @@ void JustSaveReminders(void) char ValueName[32]; int ReminderCount; - const int OldReminderCount = db_get_dw(0, MODULENAME, "RemindersData", 0); + const int OldReminderCount = g_plugin.getDword("RemindersData", 0); ReminderCount = TreeGetCount(RemindersList); - db_set_dw(0, MODULENAME, "RemindersData", ReminderCount); + g_plugin.setDword("RemindersData", ReminderCount); for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT *)TTE->next, I++) { REMINDERDATA *pReminder = (REMINDERDATA *)TTE->ptrdata; @@ -237,7 +237,7 @@ void JustSaveReminders(void) // delete any left over DB reminder entries for (; I < OldReminderCount; I++) { mir_snprintf(ValueName, "RemindersData%d", I); - db_unset(0, MODULENAME, ValueName); + g_plugin.delSetting(ValueName); } } @@ -249,7 +249,7 @@ void LoadReminders(void) BOOL GenerateUids = FALSE; RemindersList = nullptr; - int RemindersCount = db_get_dw(0, MODULENAME, "RemindersData", 0); + int RemindersCount = g_plugin.getDword("RemindersData", 0); for (int I = 0; I < RemindersCount; I++) { Size = 65535; @@ -429,7 +429,7 @@ void SaveReminders(void) void DeleteReminders(void) { PurgeReminders(); - db_set_dw(0, MODULENAME, "RemindersData", 0); + g_plugin.setDword("RemindersData", 0); PurgeReminderTree(); } @@ -465,10 +465,10 @@ static void Skin_PlaySoundPoly(LPCSTR pszSoundName) return; } - if (db_get_b(NULL, "SkinSoundsOff", pszSoundName, 0) == 0) { + if (db_get_b(0, "SkinSoundsOff", pszSoundName, 0) == 0) { DBVARIANT dbv; - if (db_get_s(NULL, "SkinSounds", pszSoundName, &dbv) == 0) { + if (db_get_s(0, "SkinSounds", pszSoundName, &dbv) == 0) { char szFull[MAX_PATH]; PathToAbsolute(dbv.pszVal, szFull); -- cgit v1.2.3