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/QuickMessages/src/Utils.cpp | 36 +++++++++++++++++------------------ plugins/QuickMessages/src/main.cpp | 8 ++++---- plugins/QuickMessages/src/options.cpp | 22 ++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) (limited to 'plugins/QuickMessages') diff --git a/plugins/QuickMessages/src/Utils.cpp b/plugins/QuickMessages/src/Utils.cpp index 82155af3c9..40c17c2111 100644 --- a/plugins/QuickMessages/src/Utils.cpp +++ b/plugins/QuickMessages/src/Utils.cpp @@ -153,22 +153,22 @@ void SaveModuleSettings(int buttonnum, ButtonData* bd) char szMEntry[256] = { '\0' }; mir_snprintf(szMEntry, "EntryName_%u_%u", buttonnum, bd->dwPos); - db_set_ws(NULL, MODULENAME, szMEntry, bd->pszName); + g_plugin.setWString(szMEntry, bd->pszName); mir_snprintf(szMEntry, "EntryValue_%u_%u", buttonnum, bd->dwPos); if (bd->pszValue) - db_set_ws(NULL, MODULENAME, szMEntry, bd->pszValue); + g_plugin.setWString(szMEntry, bd->pszValue); else - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "EntryRel_%u_%u", buttonnum, bd->dwPos); - db_set_b(NULL, MODULENAME, szMEntry, bd->fEntryType); + g_plugin.setByte(szMEntry, bd->fEntryType); mir_snprintf(szMEntry, "EntryToQMenu_%u_%u", buttonnum, bd->dwPos); - db_set_b(NULL, MODULENAME, szMEntry, bd->bInQMenu); + g_plugin.setByte(szMEntry, bd->bInQMenu); mir_snprintf(szMEntry, "EntryIsServiceName_%u_%u", buttonnum, bd->dwPos); - db_set_b(NULL, MODULENAME, szMEntry, bd->bIsServName); + g_plugin.setByte(szMEntry, bd->bIsServName); } void CleanSettings(int buttonnum, int from) @@ -177,24 +177,24 @@ void CleanSettings(int buttonnum, int from) DBVARIANT dbv = { 0 }; if (from == -1) { mir_snprintf(szMEntry, "ButtonName_%u", buttonnum); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "ButtonValue_%u", buttonnum); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "RCEntryIsServiceName_%u", buttonnum); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); } mir_snprintf(szMEntry, "EntryName_%u_%u", buttonnum, from); - while (!db_get_ws(NULL, MODULENAME, szMEntry, &dbv)) { - db_unset(NULL, MODULENAME, szMEntry); + while (!g_plugin.getWString(szMEntry, &dbv)) { + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "EntryValue_%u_%u", buttonnum, from); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "EntryRel_%u_%u", buttonnum, from); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "EntryToQMenu_%u_%u", buttonnum, from); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "EntryIsServiceName_%u_%u", buttonnum, from); - db_unset(NULL, MODULENAME, szMEntry); + g_plugin.delSetting(szMEntry); mir_snprintf(szMEntry, "EntryName_%u_%u", buttonnum, ++from); } @@ -219,7 +219,7 @@ BYTE getEntryByte(int buttonnum, int entrynum, BOOL mode) mir_snprintf(szMEntry, "RCEntryIsServiceName_%u", buttonnum); break; } - return db_get_b(NULL, MODULENAME, szMEntry, 0); + return g_plugin.getByte(szMEntry, 0); } static HANDLE AddIcon(char* szIcoName) @@ -270,7 +270,7 @@ void InitButtonsList() ListData* ld = nullptr; if (!(pszBName = getMenuEntry(i, 0, 3))) { g_iButtonsCount = i; - db_set_b(NULL, MODULENAME, "ButtonsCount", (BYTE)g_iButtonsCount); + g_plugin.setByte("ButtonsCount", (BYTE)g_iButtonsCount); break; } @@ -352,7 +352,7 @@ wchar_t* getMenuEntry(int buttonnum, int entrynum, BYTE mode) break; } - if (!db_get_ws(NULL, MODULENAME, szMEntry, &dbv)) { + if (!g_plugin.getWString(szMEntry, &dbv)) { if (mir_wstrlen(dbv.pwszVal)) buffer = mir_wstrdup(dbv.pwszVal); db_free(&dbv); diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp index e43b9b3fcb..3308f6811f 100644 --- a/plugins/QuickMessages/src/main.cpp +++ b/plugins/QuickMessages/src/main.cpp @@ -263,10 +263,10 @@ static int PluginInit(WPARAM, LPARAM) HookTemporaryEvent(ME_MSG_TOOLBARLOADED, RegisterCustomButton); - g_bRClickAuto = db_get_b(NULL, MODULENAME, "RClickAuto", 0); - g_bLClickAuto = db_get_b(NULL, MODULENAME, "LClickAuto", 0); - g_iButtonsCount = db_get_b(NULL, MODULENAME, "ButtonsCount", 0); - g_bQuickMenu = db_get_b(NULL, MODULENAME, "QuickMenu", 1); + g_bRClickAuto = g_plugin.getByte("RClickAuto", 0); + g_bLClickAuto = g_plugin.getByte("LClickAuto", 0); + g_iButtonsCount = g_plugin.getByte("ButtonsCount", 0); + g_bQuickMenu = g_plugin.getByte("QuickMenu", 1); InitButtonsList(); diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp index 7d72dd7a14..ae950639ab 100644 --- a/plugins/QuickMessages/src/options.cpp +++ b/plugins/QuickMessages/src/options.cpp @@ -249,7 +249,7 @@ void SaveMenuTree() if (ld->ptszQValue) { mir_snprintf(szMEntry, "ButtonValue_%u", iBl); - db_set_ws(NULL, MODULENAME, szMEntry, ld->ptszQValue); + g_plugin.setWString(szMEntry, ld->ptszQValue); } if (((ld->dwOPFlags & QMF_NEW) || (ld->dwOPFlags & QMF_RENAMED) || bDeleted)) { @@ -261,13 +261,13 @@ void SaveMenuTree() } mir_snprintf(szMEntry, "ButtonName_%u", iBl); - db_set_ws(NULL, MODULENAME, szMEntry, ld->ptszButtonName); + g_plugin.setWString(szMEntry, ld->ptszButtonName); ld->dwOPFlags = 0; ld->dwPos = iBl; ld->bIsServName = ld->bIsOpServName; mir_snprintf(szMEntry, "RCEntryIsServiceName_%u", iBl); - db_set_b(NULL, MODULENAME, szMEntry, ld->bIsServName); + g_plugin.setByte(szMEntry, ld->bIsServName); bDeleted = FALSE; @@ -314,7 +314,7 @@ void SaveMenuTree() iBl++; } - db_set_b(NULL, MODULENAME, "ButtonsCount", (BYTE)g_iButtonsCount); + g_plugin.setByte("ButtonsCount", (BYTE)g_iButtonsCount); } void RestoreModuleData() @@ -504,7 +504,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) g_opHdlg = hdlg; bOptionsInit = TRUE; TranslateDialogDefault(hdlg); - if (g_iButtonsCount != db_get_b(NULL, MODULENAME, "ButtonsCount", 0)) { + if (g_iButtonsCount != g_plugin.getByte("ButtonsCount", 0)) { LOGFONT logFont; HFONT hFont; bNeedRestart = TRUE; @@ -553,9 +553,9 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) EnableWindow(GetDlgItem(hdlg, IDC_MENUVALUE), FALSE); EnableWindow(GetDlgItem(hdlg, IDC_INQMENU), FALSE); EnableWindow(GetDlgItem(hdlg, IDC_ISSERVNAME), FALSE); - CheckDlgButton(hdlg, IDC_RAUTOSEND, (g_bRClickAuto = db_get_b(NULL, MODULENAME, "RClickAuto", 0)) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hdlg, IDC_LAUTOSEND, (g_bLClickAuto = db_get_b(NULL, MODULENAME, "LClickAuto", 0)) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hdlg, IDC_ENABLEQUICKMENU, (g_bQuickMenu = db_get_b(NULL, MODULENAME, "QuickMenu", 1)) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_RAUTOSEND, (g_bRClickAuto = g_plugin.getByte("RClickAuto", 0)) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_LAUTOSEND, (g_bLClickAuto = g_plugin.getByte("LClickAuto", 0)) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_ENABLEQUICKMENU, (g_bQuickMenu = g_plugin.getByte("QuickMenu", 1)) ? BST_CHECKED : BST_UNCHECKED); bOptionsInit = FALSE; }break; @@ -694,9 +694,9 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) SetMenuEntryProperties(hdlg); SaveMenuTree(); } - db_set_b(NULL, MODULENAME, "RClickAuto", (BYTE)(g_bRClickAuto = IsDlgButtonChecked(hdlg, IDC_RAUTOSEND))); - db_set_b(NULL, MODULENAME, "LClickAuto", (BYTE)(g_bLClickAuto = IsDlgButtonChecked(hdlg, IDC_LAUTOSEND))); - db_set_b(NULL, MODULENAME, "QuickMenu", (BYTE)(g_bQuickMenu = IsDlgButtonChecked(hdlg, IDC_ENABLEQUICKMENU))); + g_plugin.setByte("RClickAuto", (BYTE)(g_bRClickAuto = IsDlgButtonChecked(hdlg, IDC_RAUTOSEND))); + g_plugin.setByte("LClickAuto", (BYTE)(g_bLClickAuto = IsDlgButtonChecked(hdlg, IDC_LAUTOSEND))); + g_plugin.setByte("QuickMenu", (BYTE)(g_bQuickMenu = IsDlgButtonChecked(hdlg, IDC_ENABLEQUICKMENU))); return 1; } else if (((LPNMHDR)lparam)->code == PSN_RESET) { -- cgit v1.2.3