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/UserInfoEx/src/Flags/svc_flags.cpp | 4 +- plugins/UserInfoEx/src/classMAnnivDate.cpp | 2 +- plugins/UserInfoEx/src/classPsTree.cpp | 12 ++-- plugins/UserInfoEx/src/classPsTreeItem.cpp | 17 +++-- plugins/UserInfoEx/src/ctrl_annivedit.cpp | 8 +-- plugins/UserInfoEx/src/ctrl_base.cpp | 12 ++-- plugins/UserInfoEx/src/ctrl_combo.cpp | 2 +- plugins/UserInfoEx/src/ctrl_contact.cpp | 8 +-- plugins/UserInfoEx/src/ctrl_edit.cpp | 2 +- plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 26 +++---- plugins/UserInfoEx/src/dlg_msgbox.cpp | 4 +- plugins/UserInfoEx/src/dlg_propsheet.cpp | 18 ++--- .../UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 2 +- .../src/ex_import/dlg_ExImOpenSaveFile.cpp | 4 +- .../UserInfoEx/src/ex_import/dlg_ExImProgress.cpp | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 2 +- plugins/UserInfoEx/src/mir_db.cpp | 2 +- plugins/UserInfoEx/src/mir_icolib.cpp | 2 +- plugins/UserInfoEx/src/mir_menuitems.cpp | 24 +++---- plugins/UserInfoEx/src/psp_anniversary.cpp | 2 +- plugins/UserInfoEx/src/psp_general.cpp | 2 +- plugins/UserInfoEx/src/psp_options.cpp | 80 ++++++++++++---------- plugins/UserInfoEx/src/svc_avatar.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 8 +-- plugins/UserInfoEx/src/svc_gender.cpp | 4 +- plugins/UserInfoEx/src/svc_homepage.cpp | 4 +- plugins/UserInfoEx/src/svc_phone.cpp | 4 +- plugins/UserInfoEx/src/svc_refreshci.cpp | 6 +- plugins/UserInfoEx/src/svc_reminder.cpp | 46 ++++++------- 29 files changed, 158 insertions(+), 153 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp index 9d8f999db2..2dbeb04ac8 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp @@ -208,8 +208,8 @@ void SvcFlagsLoadModule() CreateServiceFunction(MS_FLAGS_DETECTCONTACTORIGINCOUNTRY, ServiceDetectContactOriginCountry); // init settings - g_bUseUnknownFlag = db_get_b(NULL, MODNAMEFLAGS, "UseUnknownFlag", SETTING_USEUNKNOWNFLAG_DEFAULT) != 0; - g_bShowStatusIconFlag = db_get_b(NULL, MODNAMEFLAGS, "ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT) != 0; + g_bUseUnknownFlag = db_get_b(0, MODNAMEFLAGS, "UseUnknownFlag", SETTING_USEUNKNOWNFLAG_DEFAULT) != 0; + g_bShowStatusIconFlag = db_get_b(0, MODNAMEFLAGS, "ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT) != 0; HookEvent(ME_SKIN2_ICONSCHANGED, OnStatusIconsChanged); diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp index c057cf202c..69d0aad715 100644 --- a/plugins/UserInfoEx/src/classMAnnivDate.cpp +++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp @@ -573,7 +573,7 @@ int MAnnivDate::DBWriteBirthDate(MCONTACT hContact) // only delete values from current contact's custom modules !(_wFlags & (MADF_HASPROTO|MADF_HASMETA)) && // check whether user wants this feature - db_get_b(NULL, MODULENAME, SET_REMIND_SECUREBIRTHDAY, TRUE)) + g_plugin.getByte(SET_REMIND_SECUREBIRTHDAY, TRUE)) { // keep the database clean diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp index fb895460cc..c3939a94f9 100644 --- a/plugins/UserInfoEx/src/classPsTree.cpp +++ b/plugins/UserInfoEx/src/classPsTree.cpp @@ -158,7 +158,7 @@ BYTE CPsTree::InitTreeItems(LPWORD needWidth) return FALSE; } - if (!DB::Setting::GetUString(NULL, MODULENAME, SET_LASTITEM, &dbv)) + if (!DB::Setting::GetUString(0, MODULENAME, SET_LASTITEM, &dbv)) { _curItem = FindItemIndexByName(dbv.pszVal); db_free(&dbv); @@ -552,8 +552,8 @@ void CPsTree::SaveState() } // save current selected item - if (pti) db_set_utf(NULL, MODULENAME, SET_LASTITEM, pti->Name()); - else db_unset(NULL, MODULENAME, SET_LASTITEM); + if (pti) db_set_utf(0, MODULENAME, SET_LASTITEM, pti->Name()); + else g_plugin.delSetting(SET_LASTITEM); } /** @@ -576,7 +576,7 @@ void CPsTree::DBResetState() for (auto &s : Settings) if (s && *s == '{' && !mir_strncmpi(s + 1, p, c)) - db_unset(NULL, MODULENAME, s); + g_plugin.delSetting(s); // keep only these flags _dwFlags &= PSTVF_SORTTREE|PSTVF_GROUPS; @@ -627,7 +627,7 @@ int CPsTree::BeginLabelEdit(HTREEITEM hItem) CPsTreeItem* pti; // tree is readonly - if (db_get_b(NULL, MODULENAME, SET_PROPSHEET_READONLYLABEL, 0)) + if (g_plugin.getByte(SET_PROPSHEET_READONLYLABEL, 0)) return 0; // get item text @@ -731,7 +731,7 @@ void CPsTree::PopupMenu() tvi.hItem = hti.hItem; TreeView_GetItem(_hWndTree, &tvi); - if (!db_get_b(NULL, MODULENAME, SET_PROPSHEET_READONLYLABEL, FALSE)) { + if (!g_plugin.getByte(SET_PROPSHEET_READONLYLABEL, FALSE)) { mii.dwTypeData = TranslateT("Rename Item"); mii.wID = 32001; InsertMenuItem(hPopup, 0, FALSE, &mii); diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index 18463b0f99..6e88f8d7cb 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -151,7 +151,7 @@ LPSTR CPsTreeItem::ParentItemName() { // try to read the parent item from the database DBVARIANT dbv; - if (!DB::Setting::GetAString(NULL, MODULENAME, PropertyKey(SET_ITEM_GROUP), &dbv)) + if (!DB::Setting::GetAString(0, MODULENAME, PropertyKey(SET_ITEM_GROUP), &dbv)) return dbv.pszVal; const CHAR* p = mir_strrchr(_pszName, '\\'); @@ -245,7 +245,7 @@ int CPsTreeItem::ItemLabel(const BYTE bReadDBValue) mir_free(_ptszLabel); // try to get custom label from database - if (!bReadDBValue || DB::Setting::GetTString(NULL, MODULENAME, GlobalPropertyKey(SET_ITEM_LABEL), &dbv) || (_ptszLabel = dbv.pwszVal) == nullptr) { + if (!bReadDBValue || DB::Setting::GetTString(0, MODULENAME, GlobalPropertyKey(SET_ITEM_LABEL), &dbv) || (_ptszLabel = dbv.pwszVal) == nullptr) { // extract the name LPSTR pszName = mir_strrchr(_pszName, '\\'); if (pszName && pszName[1]) @@ -425,12 +425,12 @@ int CPsTreeItem::Create(CPsHdr* pPsh, OPTIONSDIALOGPAGE *odp) // load custom order if (!(pPsh->_dwFlags & PSTVF_SORTTREE)) { - _iPosition = (int)db_get_b(NULL, MODULENAME, PropertyKey(SET_ITEM_POS), odp->position); + _iPosition = (int)g_plugin.getByte(PropertyKey(SET_ITEM_POS), odp->position); if ((_iPosition < 0) && (_iPosition > 0x800000A)) _iPosition = 0; } // read visibility state - _bState = db_get_b(NULL, MODULENAME, PropertyKey(SET_ITEM_STATE), DBTVIS_EXPANDED); + _bState = g_plugin.getByte(PropertyKey(SET_ITEM_STATE), DBTVIS_EXPANDED); // error for no longer supported dialog template type if (((UINT_PTR)odp->pszTemplate & 0xFFFF0000)) @@ -473,20 +473,19 @@ WORD CPsTreeItem::DBSaveItemState(LPCSTR pszGroup, int iItemPosition, UINT iStat // save group if ((dwFlags & PSTVF_GROUPS) && (dwFlags & PSTVF_POS_CHANGED)) - numErrors += db_set_utf(NULL, MODULENAME, PropertyKey(SET_ITEM_GROUP), (LPSTR)pszGroup); + numErrors += db_set_utf(0, MODULENAME, PropertyKey(SET_ITEM_GROUP), (LPSTR)pszGroup); // save label if ((dwFlags & PSTVF_LABEL_CHANGED) && (_dwFlags & PSTVF_LABEL_CHANGED)) - numErrors += db_set_ws(NULL, MODULENAME, GlobalPropertyKey(SET_ITEM_LABEL), Label()); + g_plugin.setWString(GlobalPropertyKey(SET_ITEM_LABEL), Label()); // save position if ((dwFlags & PSTVF_POS_CHANGED) && !(dwFlags & PSTVF_SORTTREE)) - numErrors += db_set_b(NULL, MODULENAME, PropertyKey(SET_ITEM_POS), iItemPosition); + g_plugin.setByte(PropertyKey(SET_ITEM_POS), iItemPosition); // save state if (dwFlags & PSTVF_STATE_CHANGED) - numErrors += db_set_b(NULL, MODULENAME, PropertyKey(SET_ITEM_STATE), - _hItem ? ((iState & TVIS_EXPANDED) ? DBTVIS_EXPANDED : DBTVIS_NORMAL) : DBTVIS_INVISIBLE); + g_plugin.setByte(PropertyKey(SET_ITEM_STATE), _hItem ? ((iState & TVIS_EXPANDED) ? DBTVIS_EXPANDED : DBTVIS_NORMAL) : DBTVIS_INVISIBLE); RemoveFlags(PSTVF_STATE_CHANGED|PSTVF_LABEL_CHANGED|PSTVF_POS_CHANGED); return numErrors; diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp index 4dcda44702..612a6fe0a1 100644 --- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp +++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp @@ -41,7 +41,7 @@ CAnnivEditCtrl::CAnnivEditCtrl(HWND hDlg, WORD idCtrl, LPCSTR pszSetting) _hBtnEdit = GetDlgItem(hDlg, BTN_EDIT); _hBtnMenu = GetDlgItem(hDlg, BTN_MENU); _hwndDate = GetDlgItem(hDlg, EDIT_ANNIVERSARY_DATE); - _ReminderEnabled = db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED); + _ReminderEnabled = g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED); _pDates = nullptr; _curDate = 0; @@ -148,7 +148,7 @@ void CAnnivEditCtrl::EnableCurrentItem() = !hContact || (pCurrent->Flags() & CTRLF_HASCUSTOM) || !(pCurrent->Flags() & (CTRLF_HASPROTO|CTRLF_HASMETA)) || - !db_get_b(NULL, MODULENAME, SET_PROPSHEET_PCBIREADONLY, 0); + !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0); EnableWindow(_hBtnEdit, bEnabled); EnableWindow(_hBtnDel, bEnabled); @@ -540,7 +540,7 @@ void CAnnivEditCtrl::OnReminderChecked() { if (IsDlgButtonChecked(_hwndDlg, RADIO_REMIND1)) { - _itow(db_get_b(NULL, MODULENAME, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), buf, 10); + _itow(g_plugin.getByte(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), buf, 10); EnableWindow(GetDlgItem(_hwndDlg, EDIT_REMIND), FALSE); EnableWindow(GetDlgItem(_hwndDlg, SPIN_REMIND), FALSE); state = BST_INDETERMINATE; @@ -549,7 +549,7 @@ void CAnnivEditCtrl::OnReminderChecked() { if (pCurrent->RemindOffset() == (WORD)-1) { - _itow(db_get_b(NULL, MODULENAME, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), buf, 10); + _itow(g_plugin.getByte(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), buf, 10); } else { diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp index 0d230a3c4f..cc278096ef 100644 --- a/plugins/UserInfoEx/src/ctrl_base.cpp +++ b/plugins/UserInfoEx/src/ctrl_base.cpp @@ -33,11 +33,11 @@ COLORREF clrMeta = -1; void Ctrl_InitTextColours() { - clrBoth = db_get_dw(NULL, MODULENAME, SET_PROPSHEET_CLRBOTH, RGB(0, 160, 10)); - clrChanged = db_get_dw(NULL, MODULENAME, SET_PROPSHEET_CLRCHANGED, RGB(190, 0, 0)); - clrCustom = db_get_dw(NULL, MODULENAME, SET_PROPSHEET_CLRCUSTOM, RGB(0, 10, 130)); - clrNormal = db_get_dw(NULL, MODULENAME, SET_PROPSHEET_CLRNORMAL, RGB(90, 90, 90)); - clrMeta = db_get_dw(NULL, MODULENAME, SET_PROPSHEET_CLRMETA, RGB(120, 40, 130)); + clrBoth = g_plugin.getDword(SET_PROPSHEET_CLRBOTH, RGB(0, 160, 10)); + clrChanged = g_plugin.getDword(SET_PROPSHEET_CLRCHANGED, RGB(190, 0, 0)); + clrCustom = g_plugin.getDword(SET_PROPSHEET_CLRCUSTOM, RGB(0, 10, 130)); + clrNormal = g_plugin.getDword(SET_PROPSHEET_CLRNORMAL, RGB(90, 90, 90)); + clrMeta = g_plugin.getDword(SET_PROPSHEET_CLRMETA, RGB(120, 40, 130)); } INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, WORD wFlags) @@ -55,7 +55,7 @@ INT_PTR CALLBACK Ctrl_SetTextColour(HDC hdc, WORD wFlags) INT_PTR CALLBACK Ctrl_SetTextColour(HWND hCtrl, HDC hdc) { - if (hCtrl && db_get_b(NULL, MODULENAME, SET_PROPSHEET_SHOWCOLOURS, 1)) + if (hCtrl && g_plugin.getByte(SET_PROPSHEET_SHOWCOLOURS, 1)) { LPCTRL pCtrl = (LPCTRL)GetUserData(hCtrl); if (PtrIsValid(pCtrl)) diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp index 2afbbdc00b..6c4d152a64 100644 --- a/plugins/UserInfoEx/src/ctrl_combo.cpp +++ b/plugins/UserInfoEx/src/ctrl_combo.cpp @@ -150,7 +150,7 @@ BOOL CCombo::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) _Flags.B.hasCustom = _Flags.B.hasProto = _Flags.B.hasMeta = false; _Flags.W |= DB::Setting::GetTStringCtrl(hContact, USERINFO, USERINFO, pszProto, _pszSetting, &dbv); - EnableWindow(_hwnd, !hContact || _Flags.B.hasCustom || !db_get_b(NULL, MODULENAME, SET_PROPSHEET_PCBIREADONLY, 0)); + EnableWindow(_hwnd, !hContact || _Flags.B.hasCustom || !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0)); if (_Flags.B.hasCustom || _Flags.B.hasProto || _Flags.B.hasMeta) { switch (dbv.type) { diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp index 84de9f555f..c0ad33eb9c 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.cpp +++ b/plugins/UserInfoEx/src/ctrl_contact.cpp @@ -152,7 +152,7 @@ static INT_PTR CALLBACK DlgProc_EMail(HWND hDlg, UINT msg, WPARAM wParam, LPARAM SetUserData(hDlg, lParam); SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)IcoLib_GetIcon(ICO_DLG_EMAIL, TRUE)); - if (db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1)) { + if (g_plugin.getByte(SET_ICONS_BUTTONS, 1)) { SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_OK)); SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_CANCEL)); } @@ -244,7 +244,7 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam SetUserData(hDlg, lParam); SendDlgItemMessage(hDlg, IDC_HEADERBAR, WM_SETICON, 0, (LPARAM)IcoLib_GetIcon(ICO_DLG_PHONE, TRUE)); - if (db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1)) { + if (g_plugin.getByte(SET_ICONS_BUTTONS, 1)) { SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_OK)); SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_CANCEL)); } @@ -564,7 +564,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L * return: a brush **/ case WM_CTLCOLOREDIT: - if (!db_get_b(NULL, MODULENAME, SET_PROPSHEET_SHOWCOLOURS, 1) || (HWND)lParam != cbex->hEdit || !cbex->pItems || cbex->iSelectedItem < 0) + if (!g_plugin.getByte(SET_PROPSHEET_SHOWCOLOURS, 1) || (HWND)lParam != cbex->hEdit || !cbex->pItems || cbex->iSelectedItem < 0) break; return Ctrl_SetTextColour((HDC)wParam, cbex->pItems[cbex->iSelectedItem].wFlags); @@ -1136,7 +1136,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg, WPARAM wParam, L bEnabled = !hContact || (cbex->pItems[cbex->iSelectedItem].wFlags & CTRLF_HASCUSTOM) || !(cbex->pItems[cbex->iSelectedItem].wFlags & (CTRLF_HASPROTO|CTRLF_HASMETA)) || - !db_get_b(NULL, MODULENAME, SET_PROPSHEET_PCBIREADONLY, 0); + !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0); EnableWindow(cbex->hBtnEdit, bEnabled); EnableWindow(cbex->hBtnDel, bEnabled && GetWindowTextLength(cbex->hEdit) > 0); diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp index 51a1a19607..db9efe21ea 100644 --- a/plugins/UserInfoEx/src/ctrl_edit.cpp +++ b/plugins/UserInfoEx/src/ctrl_edit.cpp @@ -114,7 +114,7 @@ BOOL CEditCtrl::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto) _Flags.W |= DB::Setting::GetTStringCtrl(hContact, _pszModule, _pszModule, pszProto, _pszSetting, &dbv); EnableWindow(_hwnd, - !hContact || _Flags.B.hasCustom || !db_get_b(NULL, MODULENAME, SET_PROPSHEET_PCBIREADONLY, 0)); + !hContact || _Flags.B.hasCustom || !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0)); MIR_FREE(_pszValue); switch (dbv.type) { diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index b49a6153c1..69dc4dce35 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -345,17 +345,17 @@ class CAnnivList } // init reminder groups - pDlg->_bRemindEnable = db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF; + pDlg->_bRemindEnable = g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF; if (hCtrl = GetDlgItem(hDlg, CHECK_REMIND)) { Button_SetCheck(hCtrl, pDlg->_bRemindEnable ? BST_INDETERMINATE : BST_UNCHECKED); EnableWindow(hCtrl, pDlg->_bRemindEnable); } - CheckDlgButton(hDlg, CHECK_POPUP, db_get_b(NULL, MODULENAME, SET_ANNIVLIST_POPUP, FALSE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, CHECK_POPUP, g_plugin.getByte(SET_ANNIVLIST_POPUP, FALSE) ? BST_CHECKED : BST_UNCHECKED); // set number of days to show contact in advance SetDlgItemInt(hDlg, EDIT_DAYS, pDlg->_filter.wDaysBefore, FALSE); if (hCtrl = GetDlgItem(hDlg, CHECK_DAYS)) { - Button_SetCheck(hCtrl, db_get_b(NULL, MODULENAME, SET_ANNIVLIST_FILTER_DAYSENABLED, FALSE)); + Button_SetCheck(hCtrl, g_plugin.getByte(SET_ANNIVLIST_FILTER_DAYSENABLED, FALSE)); DlgProc(hDlg, WM_COMMAND, MAKEWPARAM(CHECK_DAYS, BN_CLICKED), (LPARAM)hCtrl); } @@ -598,7 +598,7 @@ class CAnnivList CHAR pszSetting[MAXSETTING]; mir_snprintf(pszSetting, "AnnivDlg_Col%d", iSubItem); - lvc.cx = db_get_w(NULL, MODULENAME, pszSetting, defaultWidth); + lvc.cx = g_plugin.getWord(pszSetting, defaultWidth); lvc.mask = LVCF_WIDTH | LVCF_TEXT; lvc.iSubItem = iSubItem; lvc.pszText = TranslateW(pszText); @@ -730,7 +730,7 @@ class CAnnivList MAnnivDate ad; int i = 0; DWORD age = 0; - WORD wDaysBefore = db_get_w(NULL, MODULENAME, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET); + WORD wDaysBefore = g_plugin.getWord(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET); WORD numMale = 0; WORD numFemale = 0; WORD numContacts = 0; @@ -822,17 +822,17 @@ class CAnnivList // This method loads all filter settings from db void LoadFilter() { - _filter.wDaysBefore = db_get_w(NULL, MODULENAME, SET_ANNIVLIST_FILTER_DAYS, 9); - _filter.bFilterIndex = db_get_b(NULL, MODULENAME, SET_ANNIVLIST_FILTER_INDEX, 0); + _filter.wDaysBefore = g_plugin.getWord(SET_ANNIVLIST_FILTER_DAYS, 9); + _filter.bFilterIndex = g_plugin.getByte(SET_ANNIVLIST_FILTER_INDEX, 0); } // This method saves all filter settings to db void SaveFilter() { if (_hDlg) { - db_set_w(NULL, MODULENAME, SET_ANNIVLIST_FILTER_DAYS, (WORD)GetDlgItemInt(_hDlg, EDIT_DAYS, nullptr, FALSE)); - db_set_b(NULL, MODULENAME, SET_ANNIVLIST_FILTER_DAYSENABLED, (BYTE)Button_GetCheck(GetDlgItem(_hDlg, CHECK_DAYS))); - db_set_b(NULL, MODULENAME, SET_ANNIVLIST_FILTER_INDEX, (BYTE)ComboBox_GetCurSel(GetDlgItem(_hDlg, EDIT_DAYS))); + g_plugin.setWord(SET_ANNIVLIST_FILTER_DAYS, (WORD)GetDlgItemInt(_hDlg, EDIT_DAYS, nullptr, FALSE)); + g_plugin.setByte(SET_ANNIVLIST_FILTER_DAYSENABLED, (BYTE)Button_GetCheck(GetDlgItem(_hDlg, CHECK_DAYS))); + g_plugin.setByte(SET_ANNIVLIST_FILTER_INDEX, (BYTE)ComboBox_GetCurSel(GetDlgItem(_hDlg, EDIT_DAYS))); } } @@ -877,12 +877,12 @@ public: for (c = 0; c < cc; c++) { mir_snprintf(pszSetting, "AnnivDlg_Col%d", c); - db_set_w(NULL, MODULENAME, pszSetting, (WORD)ListView_GetColumnWidth(_hList, c)); + g_plugin.setWord(pszSetting, (WORD)ListView_GetColumnWidth(_hList, c)); } DeleteAllItems(); } // remember popup setting - db_set_b(NULL, MODULENAME, SET_ANNIVLIST_POPUP, (BYTE)IsDlgButtonChecked(_hDlg, CHECK_POPUP)); + g_plugin.setByte(SET_ANNIVLIST_POPUP, (BYTE)IsDlgButtonChecked(_hDlg, CHECK_POPUP)); // save window position, size and column widths Utils_SaveWindowPosition(_hDlg, NULL, MODULENAME, "AnnivDlg_"); SaveFilter(); @@ -928,7 +928,7 @@ INT_PTR DlgAnniversaryListShow(WPARAM, LPARAM) { if (!gpDlg) { try { - myGlobals.WantAeroAdaption = db_get_b(NULL, MODULENAME, SET_PROPSHEET_AEROADAPTION, TRUE); + myGlobals.WantAeroAdaption = g_plugin.getByte(SET_PROPSHEET_AEROADAPTION, TRUE); gpDlg = new CAnnivList(); } catch(...) { diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index ecd58db4b4..e8dfc3def4 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -644,8 +644,8 @@ INT_PTR MsgBoxService(WPARAM, LPARAM lParam) if (!(pMsgBox->uType & (MB_INFOBAR | MB_NOPOPUP)) // message box can be a popup? && ServiceExists(MS_POPUP_ADDPOPUPT) // popups exist? && myGlobals.PopupActionsExist == 1 // popup support ext stuct? - && (db_get_dw(NULL, "Popup", "Actions", 0) & 1) // popup++ actions on? - && db_get_b(NULL, MODULENAME, SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX)) // user likes popups? + && (db_get_dw(0, "Popup", "Actions", 0) & 1) // popup++ actions on? + && g_plugin.getByte(SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX)) // user likes popups? return DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_MSGBOXDUMMI), pMsgBox->hParent, MsgBoxPop, lParam); return DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_MSGBOX), pMsgBox->hParent, MsgBoxProc, lParam); diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index e61ea4c593..75bacd9cf0 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -232,8 +232,8 @@ static int SortProc(CPsTreeItem **item1, CPsTreeItem **item2) static INT_PTR ShowDialog(WPARAM wParam, LPARAM) { // update some cached settings - myGlobals.ShowPropsheetColours = db_get_b(NULL, MODULENAME, SET_PROPSHEET_SHOWCOLOURS, TRUE); - myGlobals.WantAeroAdaption = db_get_b(NULL, MODULENAME, SET_PROPSHEET_AEROADAPTION, TRUE); + myGlobals.ShowPropsheetColours = g_plugin.getByte(SET_PROPSHEET_SHOWCOLOURS, TRUE); + myGlobals.WantAeroAdaption = g_plugin.getByte(SET_PROPSHEET_AEROADAPTION, TRUE); // allow only one dialog per user if (HWND hWnd = WindowList_Find(g_hWindowList, wParam)) { @@ -247,9 +247,9 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM) bool bScanMetaSubContacts = false; // init the treeview options - if (db_get_b(NULL, MODULENAME, SET_PROPSHEET_SORTITEMS, FALSE)) + if (g_plugin.getByte(SET_PROPSHEET_SORTITEMS, FALSE)) psh._dwFlags |= PSTVF_SORTTREE; - if (db_get_b(NULL, MODULENAME, SET_PROPSHEET_GROUPS, TRUE)) + if (g_plugin.getByte(SET_PROPSHEET_GROUPS, TRUE)) psh._dwFlags |= PSTVF_GROUPS; // create imagelist @@ -409,7 +409,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam) { CPsHdr *pPsh = (CPsHdr *)wParam; if (!(pPsh->_dwFlags & PSF_PROTOPAGESONLY)) { - BYTE bChangeDetailsEnabled = myGlobals.CanChangeDetails && db_get_b(NULL, MODULENAME, SET_PROPSHEET_CHANGEMYDETAILS, FALSE); + BYTE bChangeDetailsEnabled = myGlobals.CanChangeDetails && g_plugin.getByte(SET_PROPSHEET_CHANGEMYDETAILS, FALSE); if (lParam || bChangeDetailsEnabled) { OPTIONSDIALOGPAGE odp = {}; odp.flags = ODPF_ICON | ODPF_UNICODE; @@ -935,7 +935,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar { ICO_BTN_APPLY, BM_SETIMAGE, IDAPPLY } }; - const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 1; + const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 1; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); @@ -1033,7 +1033,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar case ACKTYPE_GETINFO: // is contact the owner of the dialog or any metasubcontact of the owner? skip handling otherwise! if (ack->hContact != pPs->hContact) { - if (!db_get_b(NULL, MODULENAME, SET_META_SCAN, TRUE)) + if (!g_plugin.getByte(SET_META_SCAN, TRUE)) break; for (i = 0; i < pPs->nSubContacts; i++) { @@ -1100,7 +1100,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (hContact != pPs->hContact) { if (pPs->hContact != db_mc_getMeta(hContact)) break; - if (!db_get_b(NULL, MODULENAME, SET_META_SCAN, TRUE)) + if (!g_plugin.getByte(SET_META_SCAN, TRUE)) break; } @@ -1294,7 +1294,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar g_clistApi.pfnInvalidateDisplayNameCacheEntry(pPs->hContact); // need to upload owners settings - if (!pPs->hContact && myGlobals.CanChangeDetails && db_get_b(NULL, MODULENAME, SET_PROPSHEET_CHANGEMYDETAILS, FALSE)) { + if (!pPs->hContact && myGlobals.CanChangeDetails && g_plugin.getByte(SET_PROPSHEET_CHANGEMYDETAILS, FALSE)) { if (pPs->pUpload = new CPsUpload(pPs, LOWORD(wParam) == IDOK)) { if (pPs->pUpload->UploadFirst() == CPsUpload::UPLOAD_CONTINUE) break; diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index e4f0f3d090..689e72c564 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -167,7 +167,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar { ICO_BTN_EXPORT, BM_SETIMAGE, IDOK }, { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } }; - const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; + const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); // create imagelist for treeview diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp index df30690a1b..b38f2a54d7 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp @@ -225,9 +225,9 @@ static void SaveInitialDir(LPSTR pszInitialDir) if (p = mir_strrchr(pszInitialDir, '\\')) { *p = 0; if ( PathToRelative(pszInitialDir, szRelative)) - db_set_s(0, MODULENAME, "vCardPath", szRelative); + g_plugin.setString("vCardPath", szRelative); else - db_set_s(0, MODULENAME, "vCardPath", pszInitialDir); + g_plugin.setString("vCardPath", pszInitialDir); *p = '\\'; } } diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp index db0e72e03a..8e4ca959ae 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp @@ -42,7 +42,7 @@ INT_PTR CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar { ICO_DLG_IMPORT, STM_SETIMAGE, ICO_DLGLOGO }, { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } }; - const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; + const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); TranslateDialogDefault(hDlg); diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index 6db5af2457..067210b013 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -35,7 +35,7 @@ INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM { ICO_BTN_EXPORT, BM_SETIMAGE, IDOK }, { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } }; - const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; + const int numIconsToSet = g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2; IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet); SendDlgItemMessage(hDlg, IDOK, BUTTONTRANSLATE, NULL, NULL); diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index 16f3358b8f..9b4c936e9d 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -115,7 +115,7 @@ bool IsMeta(LPCSTR pszModule) bool IsMetaAndScan(LPCSTR pszModule) { - return 0 != db_get_b(NULL, MODULENAME, SET_META_SCAN, TRUE) && IsMeta(pszModule); + return 0 != g_plugin.getByte(SET_META_SCAN, TRUE) && IsMeta(pszModule); } } /* namespace Module */ diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp index dea1d2d8f8..d9d74c0d08 100644 --- a/plugins/UserInfoEx/src/mir_icolib.cpp +++ b/plugins/UserInfoEx/src/mir_icolib.cpp @@ -154,7 +154,7 @@ LPTSTR IcoLib_GetDefaultIconFileName() **/ static void IcoLib_CheckIconPackVersion(LPTSTR szIconPack) { - if (db_get_b(NULL, MODULENAME, SET_ICONS_CHECKFILEVERSION, TRUE)) { + if (g_plugin.getByte(SET_ICONS_CHECKFILEVERSION, TRUE)) { if (szIconPack) { wchar_t szAbsolutePath[MAX_PATH]; PathToAbsoluteW(szIconPack, szAbsolutePath); diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp index 157d7fcc1a..8b33978a46 100644 --- a/plugins/UserInfoEx/src/mir_menuitems.cpp +++ b/plugins/UserInfoEx/src/mir_menuitems.cpp @@ -73,10 +73,10 @@ void RebuildContact() SvcHomepageRebuildMenu(); // load options - int flag = db_get_b(NULL, MODULENAME, SET_MI_CONTACT, MCAS_NOTINITIATED); + int flag = g_plugin.getByte(SET_MI_CONTACT, MCAS_NOTINITIATED); if (flag == MCAS_NOTINITIATED) { flag = MCAS_EXIMPORT | TRUE; - db_set_b(NULL, MODULENAME, SET_MI_CONTACT, flag); + g_plugin.setByte(SET_MI_CONTACT, flag); } // delete all MenuItems and set all bytes 0 to avoid problems @@ -166,10 +166,10 @@ void RebuildMain() static HGENMENU hMenuItem[8] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; // load options - int flag = db_get_b(NULL, MODULENAME, SET_MI_MAIN, MCAS_NOTINITIATED); + int flag = g_plugin.getByte(SET_MI_MAIN, MCAS_NOTINITIATED); if (flag == MCAS_NOTINITIATED) { flag = MCAS_ALL | TRUE; - db_set_b(NULL, MODULENAME, SET_MI_MAIN, flag); + g_plugin.setByte(SET_MI_MAIN, flag); } // delete all MenuItems and set all bytes 0 to avoid problems @@ -240,8 +240,8 @@ void RebuildMain() // reminder mi.root = mhRoot; const BYTE bRemindMenus = - db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) && - db_get_b(NULL, MODULENAME, SET_REMIND_MENUENABLED, DEFVAL_REMIND_MENUENABLED); + g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) && + g_plugin.getByte(SET_REMIND_MENUENABLED, DEFVAL_REMIND_MENUENABLED); if (bRemindMenus) { // make backup of each protocol based birthday SET_UID(mi, 0x67980bea, 0x8fca, 0x4642, 0x96, 0x78, 0x6a, 0xc0, 0xe3, 0x74, 0x4c, 0x2a); @@ -300,10 +300,10 @@ void RebuildGroup() static HGENMENU hMenuItem[3] = { nullptr, nullptr, nullptr }; // load options - flag = db_get_b(NULL, MODULENAME, SET_MI_GROUP, MCAS_NOTINITIATED); + flag = g_plugin.getByte(SET_MI_GROUP, MCAS_NOTINITIATED); if (flag == MCAS_NOTINITIATED) { flag = MCAS_EXIMPORT | TRUE; - db_set_b(NULL, MODULENAME, SET_MI_GROUP, flag); + g_plugin.setByte(SET_MI_GROUP, flag); } // delete all MenuItems and set all bytes 0 to avoid problems @@ -391,10 +391,10 @@ void RebuildSubGroup() static HGENMENU hMenuItem[3] = { nullptr, nullptr, nullptr }; // load options - flag = db_get_b(NULL, MODULENAME, SET_MI_SUBGROUP, MCAS_NOTINITIATED); + flag = g_plugin.getByte(SET_MI_SUBGROUP, MCAS_NOTINITIATED); if (flag == MCAS_NOTINITIATED) { flag = MCAS_DISABLED | TRUE; - db_set_b(NULL, MODULENAME, SET_MI_SUBGROUP, flag); + g_plugin.setByte(SET_MI_SUBGROUP, flag); } // delete all MenuItems and set all bytes 0 to avoid problems @@ -499,10 +499,10 @@ INT_PTR RebuildAccount(WPARAM, LPARAM lParam) RemoveMenuItems(hMenuItemAccount, mItems * g_clistApi.menuProtos->getCount()); // load options - int flag = db_get_b(NULL, MODULENAME, SET_MI_ACCOUNT, MCAS_NOTINITIATED); + int flag = g_plugin.getByte(SET_MI_ACCOUNT, MCAS_NOTINITIATED); if (flag == MCAS_NOTINITIATED) { flag = MCAS_EXIMPORT | TRUE; - db_set_b(NULL, MODULENAME, SET_MI_ACCOUNT, flag); + g_plugin.setByte(SET_MI_ACCOUNT, flag); } // loop for all account names diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp index ab41b642d9..a75ad3d52f 100644 --- a/plugins/UserInfoEx/src/psp_anniversary.cpp +++ b/plugins/UserInfoEx/src/psp_anniversary.cpp @@ -44,7 +44,7 @@ static INT_PTR CALLBACK DlgProc_AnniversaryEditor(HWND hDlg, UINT uMsg, WPARAM w SetUserData(hDlg, lParam); // set icons - if (db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1)) { + if (g_plugin.getByte(SET_ICONS_BUTTONS, 1)) { SendDlgItemMessage(hDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_OK)); SendDlgItemMessage(hDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_BTN_CANCEL)); } diff --git a/plugins/UserInfoEx/src/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp index e3d1a10de4..3dc0e6de02 100644 --- a/plugins/UserInfoEx/src/psp_general.cpp +++ b/plugins/UserInfoEx/src/psp_general.cpp @@ -91,7 +91,7 @@ INT_PTR CALLBACK PSPProcGeneral(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar CheckDlgButton(hDlg, RADIO_FEMALE, (dbv.bVal == 'F') ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hDlg, RADIO_MALE, (dbv.bVal == 'M') ? BST_CHECKED : BST_UNCHECKED); - bEnable = !hContact || Flags.B.hasCustom || !db_get_b(NULL, MODULENAME, SET_PROPSHEET_PCBIREADONLY, 0); + bEnable = !hContact || Flags.B.hasCustom || !g_plugin.getByte(SET_PROPSHEET_PCBIREADONLY, 0); EnableWindow(GetDlgItem(hDlg, RADIO_FEMALE), bEnable); EnableWindow(GetDlgItem(hDlg, RADIO_MALE), bEnable); } diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 0d9ea34eaa..405e1a6191 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -135,7 +135,7 @@ static BYTE EnableControls(HWND hDlg, const int *idCtrl, int countCtrl, BYTE bEn **/ static BYTE DBGetCheckBtn(HWND hDlg, const int idCtrl, LPCSTR pszSetting, BYTE bDefault) { - BYTE val = (db_get_b(NULL, MODULENAME, pszSetting, bDefault) & 1) == 1; + BYTE val = (g_plugin.getByte(pszSetting, bDefault) & 1) == 1; CheckDlgButton(hDlg, idCtrl, val ? BST_CHECKED : BST_UNCHECKED); return val; } @@ -153,9 +153,9 @@ static BYTE DBGetCheckBtn(HWND hDlg, const int idCtrl, LPCSTR pszSetting, BYTE b static BYTE DBWriteCheckBtn(HWND hDlg, const int idCtrl, LPCSTR pszSetting) { BYTE val = IsDlgButtonChecked(hDlg, idCtrl); - int Temp = db_get_b(NULL, MODULENAME, pszSetting, 0); + int Temp = g_plugin.getByte(pszSetting, 0); Temp &= ~1; - db_set_b(NULL, MODULENAME, pszSetting, Temp |= val); + g_plugin.setByte(pszSetting, Temp |= val); return val; } @@ -172,7 +172,7 @@ static BYTE DBWriteCheckBtn(HWND hDlg, const int idCtrl, LPCSTR pszSetting) **/ static void DBGetColor(HWND hDlg, const int idCtrl, LPCSTR pszSetting, DWORD bDefault) { - SendDlgItemMessage(hDlg, idCtrl, CPM_SETCOLOUR, 0, db_get_dw(NULL, MODULENAME, pszSetting, bDefault)); + SendDlgItemMessage(hDlg, idCtrl, CPM_SETCOLOUR, 0, g_plugin.getDword(pszSetting, bDefault)); } /** @@ -187,7 +187,7 @@ static void DBGetColor(HWND hDlg, const int idCtrl, LPCSTR pszSetting, DWORD bDe **/ static void DBWriteColor(HWND hDlg, const int idCtrl, LPCSTR pszSetting) { - db_set_dw(NULL, MODULENAME, pszSetting, (DWORD)SendDlgItemMessage(hDlg, idCtrl, CPM_GETCOLOUR, 0, 0)); + g_plugin.setDword(pszSetting, (DWORD)SendDlgItemMessage(hDlg, idCtrl, CPM_GETCOLOUR, 0, 0)); } /** @@ -209,8 +209,10 @@ static BYTE DBWriteEditByte(HWND hDlg, const int idCtrl, LPCSTR pszSetting, BYTE BOOL t; v = (BYTE)GetDlgItemInt(hDlg, idCtrl, &t, FALSE); - if (t && (v != db_get_b(NULL, MODULENAME, pszSetting, defVal))) - return db_set_b(NULL, MODULENAME, pszSetting, v) == 0; + if (t && (v != g_plugin.getByte(pszSetting, defVal))) { + g_plugin.setByte(pszSetting, v); + return true; + } return FALSE; } @@ -233,8 +235,10 @@ static BYTE DBWriteEditWord(HWND hDlg, const int idCtrl, LPCSTR pszSetting, WORD BOOL t; v = (WORD)GetDlgItemInt(hDlg, idCtrl, &t, FALSE); - if (t && (v != db_get_w(NULL, MODULENAME, pszSetting, defVal))) - return db_set_w(NULL, MODULENAME, pszSetting, v) == 0; + if (t && (v != g_plugin.getWord(pszSetting, defVal))) { + g_plugin.setWord(pszSetting, v); + return true; + } return FALSE; } @@ -256,8 +260,10 @@ static BYTE DBWriteComboByte(HWND hDlg, const int idCtrl, LPCSTR pszSetting, BYT BYTE v; v = (BYTE)SendDlgItemMessage(hDlg, idCtrl, CB_GETCURSEL, NULL, NULL); - if (v != db_get_b(NULL, MODULENAME, pszSetting, defVal)) - return db_set_b(NULL, MODULENAME, pszSetting, v) == 0; + if (v != g_plugin.getByte(pszSetting, defVal)) { + g_plugin.setByte(pszSetting, v); + return true; + } return FALSE; } @@ -279,7 +285,7 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, // menu item settings for (auto &it : ctrl_Menu) { - int flag = db_get_b(NULL, MODULENAME, it.pszKey, 2); + int flag = g_plugin.getByte(it.pszKey, 2); // check button and enable / disable control int idEnable[] = { it.idCheckbox + 1, it.idNONE, it.idALL, it.idEXIMPORT }; EnableControls(hDlg, idEnable, _countof(idEnable), DBGetCheckBtn(hDlg, it.idCheckbox, it.pszKey, 0)); @@ -313,7 +319,7 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, flag |= IsDlgButtonChecked(hDlg, it.idNONE) ? 2 : 0; flag |= IsDlgButtonChecked(hDlg, it.idALL) ? 4 : 0; flag |= IsDlgButtonChecked(hDlg, it.idEXIMPORT) ? 8 : 0; - db_set_b(NULL, MODULENAME, it.pszKey, (BYTE)flag); + g_plugin.setByte(it.pszKey, (BYTE)flag); } RebuildMenu(); @@ -324,14 +330,14 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, bool valNew = IsDlgButtonChecked(hDlg, CHECK_OPT_FLAGSUNKNOWN) != 0; if (g_bUseUnknownFlag != valNew) { g_bUseUnknownFlag = valNew; - db_set_b(NULL, MODNAMEFLAGS, "UseUnknownFlag", valNew); + db_set_b(0, MODNAMEFLAGS, "UseUnknownFlag", valNew); FlagsClistChange = true; FlagsMsgWndChange = true; } valNew = IsDlgButtonChecked(hDlg, CHECK_OPT_FLAGSMSGSTATUS) != 0; if (g_bShowStatusIconFlag != valNew) { g_bShowStatusIconFlag = valNew; - db_set_b(NULL, MODNAMEFLAGS, "ShowStatusIconFlag", valNew); + db_set_b(0, MODNAMEFLAGS, "ShowStatusIconFlag", valNew); FlagsMsgWndChange = true; } @@ -347,7 +353,7 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, // misc BYTE bEnabled = IsDlgButtonChecked(hDlg, CHECK_OPT_ZODIACAVATAR); - db_set_b(NULL, MODULENAME, SET_ZODIAC_AVATARS, bEnabled); + g_plugin.setByte(SET_ZODIAC_AVATARS, bEnabled); NServices::NAvatar::Enable(bEnabled); } break; @@ -615,7 +621,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam bInitialized = 0; // set reminder options - BYTE bEnabled = db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED); + BYTE bEnabled = g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED); SendDlgItemMessage(hDlg, EDIT_REMIND_ENABLED, CB_SETCURSEL, bEnabled, NULL); DlgProc_ReminderOpts(hDlg, WM_COMMAND, MAKEWPARAM(EDIT_REMIND_ENABLED, CBN_SELCHANGE), (LPARAM)GetDlgItem(hDlg, EDIT_REMIND_ENABLED)); @@ -626,16 +632,16 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam DBGetCheckBtn(hDlg, CHECK_REMIND_STARTUP, SET_REMIND_CHECKON_STARTUP, FALSE); DBGetCheckBtn(hDlg, CHECK_REMIND_SECURED, SET_REMIND_SECUREBIRTHDAY, FALSE); - SetDlgItemInt(hDlg, EDIT_REMIND, db_get_w(NULL, MODULENAME, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), FALSE); - SetDlgItemInt(hDlg, EDIT_REMIND_SOUNDOFFSET, db_get_b(NULL, MODULENAME, SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), FALSE); - SetDlgItemInt(hDlg, EDIT_REMIND2, db_get_w(NULL, MODULENAME, SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL), FALSE); + SetDlgItemInt(hDlg, EDIT_REMIND, g_plugin.getWord(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET), FALSE); + SetDlgItemInt(hDlg, EDIT_REMIND_SOUNDOFFSET, g_plugin.getByte(SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), FALSE); + SetDlgItemInt(hDlg, EDIT_REMIND2, g_plugin.getWord(SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL), FALSE); - SendDlgItemMessage(hDlg, EDIT_BIRTHMODULE, CB_SETCURSEL, db_get_b(NULL, MODULENAME, SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE), NULL); + SendDlgItemMessage(hDlg, EDIT_BIRTHMODULE, CB_SETCURSEL, g_plugin.getByte(SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE), NULL); MTime mtLast; wchar_t szTime[MAX_PATH]; - mtLast.DBGetStamp(NULL, MODULENAME, SET_REMIND_LASTCHECK); + mtLast.DBGetStamp(0, MODULENAME, SET_REMIND_LASTCHECK); mtLast.UTCToLocal(); mtLast.TimeFormat(szTime, _countof(szTime)); @@ -661,7 +667,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam bReminderCheck = DBWriteEditWord(hDlg, EDIT_REMIND, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET); // save primary birthday module - BYTE bOld = db_get_b(NULL, MODULENAME, SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE); // = 1 + BYTE bOld = g_plugin.getByte(SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE); // = 1 BYTE bNew = (BYTE)ComboBox_GetCurSel(GetDlgItem(hDlg, EDIT_BIRTHMODULE)); if (bOld != bNew) { // keep the database clean @@ -675,8 +681,8 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam // update current reminder state BYTE bNewVal = (BYTE)SendDlgItemMessage(hDlg, EDIT_REMIND_ENABLED, CB_GETCURSEL, NULL, NULL); - if (db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, 1) != bNewVal) { - db_set_b(NULL, MODULENAME, SET_REMIND_ENABLED, bNewVal); + if (g_plugin.getByte(SET_REMIND_ENABLED, 1) != bNewVal) { + g_plugin.setByte(SET_REMIND_ENABLED, bNewVal); if (bNewVal == REMIND_OFF) { SvcReminderEnable(FALSE); bReminderCheck = FALSE; @@ -729,7 +735,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam if (bInitialized && HIWORD(wParam) == EN_UPDATE) { BOOL t; WORD v = (WORD)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE); - if (t && (v != db_get_w(NULL, MODULENAME, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET))) + if (t && (v != g_plugin.getWord(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET))) NotifyParentOfChange(hDlg); } break; @@ -739,7 +745,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam if (bInitialized && HIWORD(wParam) == EN_UPDATE) { BOOL t; BYTE v = (BYTE)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE); - if (t && (v != db_get_b(NULL, MODULENAME, SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET))) + if (t && (v != g_plugin.getByte(SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET))) NotifyParentOfChange(hDlg); } break; @@ -749,7 +755,7 @@ static INT_PTR CALLBACK DlgProc_ReminderOpts(HWND hDlg, UINT uMsg, WPARAM wParam if (bInitialized && HIWORD(wParam) == EN_UPDATE) { BOOL t; WORD v = (WORD)GetDlgItemInt(hDlg, LOWORD(wParam), &t, FALSE); - if (t && (v != db_get_w(NULL, MODULENAME, SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL))) + if (t && (v != g_plugin.getWord(SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL))) NotifyParentOfChange(hDlg); } } @@ -792,7 +798,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // set colortype checkboxes and color controls DBGetColor(hDlg, CLR_BBACK, SET_POPUP_BIRTHDAY_COLOR_BACK, RGB(192, 180, 30)); DBGetColor(hDlg, CLR_BTEXT, SET_POPUP_BIRTHDAY_COLOR_TEXT, RGB(0, 0, 0)); - switch (db_get_b(NULL, MODULENAME, SET_POPUP_BIRTHDAY_COLORTYPE, POPUP_COLOR_CUSTOM)) { + switch (g_plugin.getByte(SET_POPUP_BIRTHDAY_COLORTYPE, POPUP_COLOR_CUSTOM)) { case POPUP_COLOR_DEFAULT: CheckDlgButton(hDlg, CHECK_OPT_POPUP_DEFCLR, BST_CHECKED); break; @@ -803,7 +809,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR DBGetColor(hDlg, CLR_ABACK, SET_POPUP_ANNIVERSARY_COLOR_BACK, RGB(90, 190, 130)); DBGetColor(hDlg, CLR_ATEXT, SET_POPUP_ANNIVERSARY_COLOR_TEXT, RGB(0, 0, 0)); - switch (db_get_b(NULL, MODULENAME, SET_POPUP_ANNIVERSARY_COLORTYPE, POPUP_COLOR_CUSTOM)) { + switch (g_plugin.getByte(SET_POPUP_ANNIVERSARY_COLORTYPE, POPUP_COLOR_CUSTOM)) { case POPUP_COLOR_DEFAULT: CheckDlgButton(hDlg, CHECK_OPT_POPUP_ADEFCLR, BST_CHECKED); break; @@ -816,7 +822,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(CHECK_OPT_POPUP_ADEFCLR, BN_CLICKED), NULL); } // set delay values - bDelay = db_get_b(NULL, MODULENAME, SET_POPUP_DELAY, 0); + bDelay = g_plugin.getByte(SET_POPUP_DELAY, 0); switch (bDelay) { case 0: CheckDlgButton(hDlg, RADIO_OPT_POPUP_DEFAULT, BST_CHECKED); @@ -846,7 +852,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // save popup style for birthdays DBWriteColor(hDlg, CLR_BBACK, SET_POPUP_BIRTHDAY_COLOR_BACK); DBWriteColor(hDlg, CLR_BTEXT, SET_POPUP_BIRTHDAY_COLOR_TEXT); - db_set_b(NULL, MODULENAME, SET_POPUP_BIRTHDAY_COLORTYPE, + g_plugin.setByte(SET_POPUP_BIRTHDAY_COLORTYPE, IsDlgButtonChecked(hDlg, CHECK_OPT_POPUP_DEFCLR) ? POPUP_COLOR_DEFAULT : IsDlgButtonChecked(hDlg, CHECK_OPT_POPUP_WINCLR) @@ -856,7 +862,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // save popup style for anniversaries DBWriteColor(hDlg, CLR_ABACK, SET_POPUP_ANNIVERSARY_COLOR_BACK); DBWriteColor(hDlg, CLR_ATEXT, SET_POPUP_ANNIVERSARY_COLOR_TEXT); - db_set_b(NULL, MODULENAME, SET_POPUP_ANNIVERSARY_COLORTYPE, + g_plugin.setByte(SET_POPUP_ANNIVERSARY_COLORTYPE, IsDlgButtonChecked(hDlg, CHECK_OPT_POPUP_ADEFCLR) ? POPUP_COLOR_DEFAULT : IsDlgButtonChecked(hDlg, CHECK_OPT_POPUP_AWINCLR) @@ -865,14 +871,14 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // save delay if (IsDlgButtonChecked(hDlg, RADIO_OPT_POPUP_PERMANENT)) - db_set_b(NULL, MODULENAME, SET_POPUP_DELAY, 255); + g_plugin.setByte(SET_POPUP_DELAY, 255); else if (IsDlgButtonChecked(hDlg, RADIO_OPT_POPUP_CUSTOM)) { wchar_t szDelay[4]; GetDlgItemText(hDlg, EDIT_DELAY, szDelay, _countof(szDelay)); - db_set_b(NULL, MODULENAME, SET_POPUP_DELAY, (BYTE)wcstol(szDelay, nullptr, 10)); + g_plugin.setByte(SET_POPUP_DELAY, (BYTE)wcstol(szDelay, nullptr, 10)); } else - db_unset(NULL, MODULENAME, SET_POPUP_DELAY); + g_plugin.delSetting(SET_POPUP_DELAY); } break; @@ -881,7 +887,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR case BTN_PREVIEW: { POPUPDATAT ppd = { 0 }; - ppd.iSeconds = (int)db_get_b(NULL, MODULENAME, SET_POPUP_DELAY, 0); + ppd.iSeconds = (int)g_plugin.getByte(SET_POPUP_DELAY, 0); mir_wstrncpy(ppd.lptzText, TranslateT("This is the reminder message"), MAX_SECONDLINE); // Birthday diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp index 9884240d26..14a1d1c247 100644 --- a/plugins/UserInfoEx/src/svc_avatar.cpp +++ b/plugins/UserInfoEx/src/svc_avatar.cpp @@ -155,7 +155,7 @@ namespace NServices **/ void OnModulesLoaded() { - Enable(db_get_b(NULL, MODULENAME, SET_ZODIAC_AVATARS, FALSE)); + Enable(g_plugin.getByte(SET_ZODIAC_AVATARS, FALSE)); } } /* namespace NAvatar */ diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index 8d7d7c4952..7652aba64f 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -177,7 +177,7 @@ void SvcEMailRebuildMenu() { static HANDLE hPrebuildMenuHook = nullptr; - if (db_get_b(NULL, MODULENAME, SET_EXTENDED_EMAILSERVICE, TRUE)) { + if (g_plugin.getByte(SET_EXTENDED_EMAILSERVICE, TRUE)) { if (!hPrebuildMenuHook) hPrebuildMenuHook = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildMenu); @@ -216,9 +216,9 @@ bool SvcEMailEnableExtraIcons(bool bEnable, bool bUpdateDB) if (bUpdateDB) { bChanged = g_eiEmail != bEnable; - db_set_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_EMAIL, g_eiEmail = bEnable); + g_plugin.setByte(SET_CLIST_EXTRAICON_EMAIL, g_eiEmail = bEnable); } - else bChanged = g_eiEmail = db_get_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_EMAIL, DEFVAL_CLIST_EXTRAICON_EMAIL) != 0; + else bChanged = g_eiEmail = g_plugin.getByte(SET_CLIST_EXTRAICON_EMAIL, DEFVAL_CLIST_EXTRAICON_EMAIL) != 0; if (g_eiEmail) { // E-mail checked // hook events @@ -252,7 +252,7 @@ bool SvcEMailEnableExtraIcons(bool bEnable, bool bUpdateDB) void SvcEMailLoadModule() { SvcEMailEnableExtraIcons(); - if (db_get_b(NULL, MODULENAME, SET_EXTENDED_EMAILSERVICE, TRUE)) { + if (g_plugin.getByte(SET_EXTENDED_EMAILSERVICE, TRUE)) { // create own email send command DestroyServiceFunction(MS_EMAIL_SENDEMAIL); CreateServiceFunction(MS_EMAIL_SENDEMAIL, MenuCommand); diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp index b6827227eb..bd57c715c5 100644 --- a/plugins/UserInfoEx/src/svc_gender.cpp +++ b/plugins/UserInfoEx/src/svc_gender.cpp @@ -111,9 +111,9 @@ bool SvcGenderEnableExtraIcons(bool bEnable, bool bUpdateDB) if (bUpdateDB) { bChanged = g_eiGender != bEnable; - db_set_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_GENDER2, g_eiGender = bEnable); + g_plugin.setByte(SET_CLIST_EXTRAICON_GENDER2, g_eiGender = bEnable); } - else bChanged = g_eiGender = db_get_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_GENDER2, 0) != 0; + else bChanged = g_eiGender = g_plugin.getByte(SET_CLIST_EXTRAICON_GENDER2, 0) != 0; if (g_eiGender) { // Gender checked or dropdown select if (ghExtraIconSvc == INVALID_HANDLE_VALUE) diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index dbf32d5f67..8361873cb6 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -176,9 +176,9 @@ bool SvcHomepageEnableExtraIcons(bool bEnable, bool bUpdateDB) if (bUpdateDB) { bChanged = g_eiHome != bEnable; - db_set_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_HOMEPAGE, g_eiHome = bEnable); + g_plugin.setByte(SET_CLIST_EXTRAICON_HOMEPAGE, g_eiHome = bEnable); } - else bChanged = g_eiHome = db_get_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_HOMEPAGE, DEFVAL_CLIST_EXTRAICON_HOMEPAGE) != 0; + else bChanged = g_eiHome = g_plugin.getByte(SET_CLIST_EXTRAICON_HOMEPAGE, DEFVAL_CLIST_EXTRAICON_HOMEPAGE) != 0; if (g_eiHome) { // hook events diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp index 18e4cbb4e1..49215d1471 100644 --- a/plugins/UserInfoEx/src/svc_phone.cpp +++ b/plugins/UserInfoEx/src/svc_phone.cpp @@ -132,9 +132,9 @@ bool SvcPhoneEnableExtraIcons(bool bEnable, bool bUpdateDB) if (bUpdateDB) { bChanged = g_eiPhone != bEnable; - db_set_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_PHONE, g_eiPhone = bEnable); + g_plugin.setByte(SET_CLIST_EXTRAICON_PHONE, g_eiPhone = bEnable); } - else bChanged = g_eiPhone = db_get_b(NULL, MODULENAME, SET_CLIST_EXTRAICON_PHONE, DEFVAL_CLIST_EXTRAICON_PHONE) != 0; + else bChanged = g_eiPhone = g_plugin.getByte(SET_CLIST_EXTRAICON_PHONE, DEFVAL_CLIST_EXTRAICON_PHONE) != 0; // force module enabled, if extraicon plugin was found if (g_eiPhone) { diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index 53cdac42d9..6f3d9473ea 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -241,7 +241,7 @@ class CDlgUpdProgress : public CUpdProgress { ICO_BTN_DOWNARROW, BM_SETIMAGE, IDSKIP }, { ICO_BTN_CANCEL, BM_SETIMAGE, IDCANCEL } }; - IcoLib_SetCtrlIcons(hWnd, idIcon, db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? 2 : 1); + IcoLib_SetCtrlIcons(hWnd, idIcon, g_plugin.getByte(SET_ICONS_BUTTONS, 1) ? 2 : 1); SendDlgItemMessage(hWnd, IDCANCEL, BUTTONTRANSLATE, NULL, NULL); SendDlgItemMessage(hWnd, IDSKIP, BUTTONTRANSLATE, NULL, NULL); @@ -390,7 +390,7 @@ public: : CUpdProgress(data) { _szText = nullptr; - _bBBCode = db_get_b(NULL, "Popup", "UseMText", FALSE); + _bBBCode = db_get_b(0, "Popup", "UseMText", FALSE); _popupButtons[0].cbSize = sizeof(POPUPACTION); _popupButtons[0].flags = PAF_ENABLED; @@ -690,7 +690,7 @@ public: if (Size() && !_pProgress) { - if (ServiceExists(MS_POPUP_CHANGETEXTT) && db_get_b(NULL, MODULENAME, "PopupProgress", FALSE)) + if (ServiceExists(MS_POPUP_CHANGETEXTT) && g_plugin.getByte("PopupProgress", FALSE)) { _pProgress = new CPopupUpdProgress(this); } diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index d5a7aedb14..005c1e711c 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -251,7 +251,7 @@ static int NotifyWithPopup(MCONTACT hContact, CEvent::EType eventType, int DaysT POPUPDATAT ppd = { 0 }; ppd.PluginWindowProc = PopupWindowProc; - ppd.iSeconds = (int)db_get_b(NULL, MODULENAME, SET_POPUP_DELAY, 0); + ppd.iSeconds = (int)g_plugin.getByte(SET_POPUP_DELAY, 0); if (hContact) { ppd.lchContact = hContact; @@ -265,29 +265,29 @@ static int NotifyWithPopup(MCONTACT hContact, CEvent::EType eventType, int DaysT switch (eventType) { case CEvent::BIRTHDAY: - switch (db_get_b(NULL, MODULENAME, SET_POPUP_BIRTHDAY_COLORTYPE, POPUP_COLOR_CUSTOM)) { + switch (g_plugin.getByte(SET_POPUP_BIRTHDAY_COLORTYPE, POPUP_COLOR_CUSTOM)) { case POPUP_COLOR_WINDOWS: ppd.colorBack = GetSysColor(COLOR_BTNFACE); ppd.colorText = GetSysColor(COLOR_WINDOWTEXT); break; case POPUP_COLOR_CUSTOM: - ppd.colorBack = db_get_dw(NULL, MODULENAME, SET_POPUP_BIRTHDAY_COLOR_BACK, RGB(192, 180, 30)); - ppd.colorText = db_get_dw(NULL, MODULENAME, SET_POPUP_BIRTHDAY_COLOR_TEXT, 0); + ppd.colorBack = g_plugin.getDword(SET_POPUP_BIRTHDAY_COLOR_BACK, RGB(192, 180, 30)); + ppd.colorText = g_plugin.getDword(SET_POPUP_BIRTHDAY_COLOR_TEXT, 0); break; } break; case CEvent::ANNIVERSARY: - switch (db_get_b(NULL, MODULENAME, SET_POPUP_ANNIVERSARY_COLORTYPE, POPUP_COLOR_CUSTOM)) { + switch (g_plugin.getByte(SET_POPUP_ANNIVERSARY_COLORTYPE, POPUP_COLOR_CUSTOM)) { case POPUP_COLOR_WINDOWS: ppd.colorBack = GetSysColor(COLOR_BTNFACE); ppd.colorText = GetSysColor(COLOR_WINDOWTEXT); break; case POPUP_COLOR_CUSTOM: - ppd.colorBack = db_get_dw(NULL, MODULENAME, SET_POPUP_ANNIVERSARY_COLOR_BACK, RGB(90, 190, 130)); - ppd.colorText = db_get_dw(NULL, MODULENAME, SET_POPUP_ANNIVERSARY_COLOR_TEXT, 0); + ppd.colorBack = g_plugin.getDword(SET_POPUP_ANNIVERSARY_COLOR_BACK, RGB(90, 190, 130)); + ppd.colorText = g_plugin.getDword(SET_POPUP_ANNIVERSARY_COLOR_TEXT, 0); break; } } @@ -349,7 +349,7 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt) static BYTE NotifyWithSound(const CEvent &evt) { - if (evt._wDaysLeft <= min(db_get_b(NULL, MODULENAME, SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), gRemindOpts.wDaysEarlier)) { + if (evt._wDaysLeft <= min(g_plugin.getByte(SET_REMIND_SOUNDOFFSET, DEFVAL_REMIND_SOUNDOFFSET), gRemindOpts.wDaysEarlier)) { switch (evt._eType) { case CEvent::BIRTHDAY: Skin_PlaySound(evt._wDaysLeft == 0 ? SOUND_BIRTHDAY_TODAY : SOUND_BIRTHDAY_SOON); @@ -460,7 +460,7 @@ static bool CheckBirthday(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE bNoti mtb.DBGetReminderOpts(hContact); // make backup of each protocol based birthday - if (db_get_b(NULL, MODULENAME, SET_REMIND_SECUREBIRTHDAY, TRUE)) + if (g_plugin.getByte(SET_REMIND_SECUREBIRTHDAY, TRUE)) mtb.BackupBirthday(hContact, nullptr, 0, LastAnwer); if (mtb.RemindOption() != BST_UNCHECKED) { @@ -572,7 +572,7 @@ void SvcReminderCheckAll(const ENotify notify) NotifyWithSound(evt); // popup anniversary list - if (db_get_b(NULL, MODULENAME, SET_ANNIVLIST_POPUP, FALSE)) + if (g_plugin.getByte(SET_ANNIVLIST_POPUP, FALSE)) DlgAnniversaryListShow(0, 0); if (evt._wDaysLeft > gRemindOpts.wDaysEarlier && notify == NOTIFY_NOANNIV) @@ -733,7 +733,7 @@ static INT_PTR BackupBirthdayService(WPARAM hContact, LPARAM lParam) LPCSTR SvcReminderGetMyBirthdayModule() { - return ((db_get_b(NULL, MODULENAME, SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE) == 1) ? USERINFO : MOD_MBIRTHDAY); + return ((g_plugin.getByte(SET_REMIND_BIRTHMODULE, DEFVAL_REMIND_BIRTHMODULE) == 1) ? USERINFO : MOD_MBIRTHDAY); } /*********************************************************************************************************** @@ -787,23 +787,23 @@ static void CALLBACK TimerProc_Check(HWND, UINT, UINT_PTR, DWORD) static void UpdateTimer(BYTE bStartup) { - LONG wNotifyInterval = 60 * 60 * (LONG)db_get_w(NULL, MODULENAME, SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL); + LONG wNotifyInterval = 60 * 60 * (LONG)g_plugin.getWord(SET_REMIND_NOTIFYINTERVAL, DEFVAL_REMIND_NOTIFYINTERVAL); MTime now, last; now.GetTimeUTC(); if (bStartup) { - last.DBGetStamp(NULL, MODULENAME, SET_REMIND_LASTCHECK); + last.DBGetStamp(0, MODULENAME, SET_REMIND_LASTCHECK); // if last check occured at least one day before just do it on startup again - if (now.Year() > last.Year() || now.Month() > last.Month() || now.Day() > last.Day() || db_get_b(NULL, MODULENAME, SET_REMIND_CHECKON_STARTUP, FALSE)) + if (now.Year() > last.Year() || now.Month() > last.Month() || now.Day() > last.Day() || g_plugin.getByte(SET_REMIND_CHECKON_STARTUP, FALSE)) wNotifyInterval = 5; else wNotifyInterval -= now.Compare(last); ghRemindDateChangeTimer = SetTimer(nullptr, 0, 1000 * 60 * 5, (TIMERPROC)TimerProc_DateChanged); } - else now.DBWriteStamp(NULL, MODULENAME, SET_REMIND_LASTCHECK); + else now.DBWriteStamp(0, MODULENAME, SET_REMIND_LASTCHECK); // wait at least 5 seconds before checking at startup, to give miranda a better chance to load faster KillTimer(nullptr, ghRemindTimer); @@ -825,12 +825,12 @@ void SvcReminderEnable(BYTE bEnable) ghSettingsChanged = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, (MIRANDAHOOK)OnContactSettingChanged); // reinit reminder options - gRemindOpts.RemindState = db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED); - gRemindOpts.wDaysEarlier = db_get_w(NULL, MODULENAME, SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET); - gRemindOpts.bCListExtraIcon = db_get_b(NULL, MODULENAME, SET_REMIND_EXTRAICON, 1); - gRemindOpts.bCheckVisibleOnly = db_get_b(NULL, MODULENAME, SET_REMIND_CHECKVISIBLE, DEFVAL_REMIND_CHECKVISIBLE); - gRemindOpts.bFlashCList = db_get_b(NULL, MODULENAME, SET_REMIND_FLASHICON, FALSE); - gRemindOpts.bPopups = ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, MODULENAME, SET_POPUP_ENABLED, DEFVAL_POPUP_ENABLED); + gRemindOpts.RemindState = g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED); + gRemindOpts.wDaysEarlier = g_plugin.getWord(SET_REMIND_OFFSET, DEFVAL_REMIND_OFFSET); + gRemindOpts.bCListExtraIcon = g_plugin.getByte(SET_REMIND_EXTRAICON, 1); + gRemindOpts.bCheckVisibleOnly = g_plugin.getByte(SET_REMIND_CHECKVISIBLE, DEFVAL_REMIND_CHECKVISIBLE); + gRemindOpts.bFlashCList = g_plugin.getByte(SET_REMIND_FLASHICON, FALSE); + gRemindOpts.bPopups = ServiceExists(MS_POPUP_ADDPOPUPT) && g_plugin.getByte(SET_POPUP_ENABLED, DEFVAL_POPUP_ENABLED); // init the timer UpdateTimer(TRUE); @@ -857,7 +857,7 @@ void SvcReminderOnModulesLoaded(void) // init clist extra icon structure OnCListRebuildIcons(0, 0); - SvcReminderEnable(db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF); + SvcReminderEnable(g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF); } /** @@ -883,7 +883,7 @@ void SvcReminderLoadModule(void) hk.pszService = MS_USERINFO_REMINDER_CHECK; g_plugin.addHotkey(&hk); - if (db_get_b(NULL, MODULENAME, SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF && ExtraIcon == INVALID_HANDLE_VALUE) + if (g_plugin.getByte(SET_REMIND_ENABLED, DEFVAL_REMIND_ENABLED) != REMIND_OFF && ExtraIcon == INVALID_HANDLE_VALUE) ExtraIcon = ExtraIcon_RegisterIcolib("Reminder", LPGEN("Reminder (UInfoEx)"), ICO_COMMON_ANNIVERSARY); } -- cgit v1.2.3