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/Import/src/import.cpp | 6 +++--- plugins/Import/src/main.cpp | 4 ++-- plugins/Import/src/miranda.cpp | 4 ++-- plugins/Import/src/wizard.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Import/src') diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 14f803d84f..a6b5917329 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -485,19 +485,19 @@ bool ImportAccounts(OBJLIST &arSkippedModules) itoa(400 + p->iSrcIndex, szSetting, 10); int iVal = myGetD(NULL, "Protocols", szSetting, 1); itoa(400 + p->pa->iOrder, szSetting, 10); - db_set_dw(NULL, "Protocols", szSetting, iVal); + db_set_dw(0, "Protocols", szSetting, iVal); p->pa->bIsVisible = iVal != 0; itoa(600 + p->iSrcIndex, szSetting, 10); iVal = myGetD(NULL, "Protocols", szSetting, 1); itoa(600 + p->pa->iOrder, szSetting, 10); - db_set_dw(NULL, "Protocols", szSetting, iVal); + db_set_dw(0, "Protocols", szSetting, iVal); p->pa->bIsEnabled = iVal != 0; if (p->tszSrcName == NULL) { p->pa->tszAccountName = mir_a2u(p->pa->szModuleName); itoa(800 + p->pa->iOrder, szSetting, 10); - db_set_ws(NULL, "Protocols", szSetting, p->pa->tszAccountName); + db_set_ws(0, "Protocols", szSetting, p->pa->tszAccountName); } if (bImportSysAll) diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index d1a42b5c0a..6aabd7534a 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -72,11 +72,11 @@ static int ModulesLoaded(WPARAM, LPARAM) mi.pszService = MS_IMPORT_CONTACT; Menu_AddContactMenuItem(&mi); - if (!db_get_b(NULL, IMPORT_MODULE, IMP_KEY_FR, 0)) { + if (!g_plugin.getByte(IMP_KEY_FR, 0)) { // Only autorun import wizard if at least one protocol is installed if (Accounts().getCount() > 0) { CallService(MS_IMPORT_SERVICE, 0, 0); - db_set_b(NULL, IMPORT_MODULE, IMP_KEY_FR, 1); + g_plugin.setByte(IMP_KEY_FR, 1); } } return 0; diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 9a517d341c..c56d1b5557 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -268,7 +268,7 @@ CMirandaAdvOptionsPageDlg::CMirandaAdvOptionsPageDlg() : bool CMirandaAdvOptionsPageDlg::OnInitDialog() { - dwSinceDate = db_get_dw(NULL, IMPORT_MODULE, "ImportSinceTS", time(0)); + dwSinceDate = g_plugin.getDword("ImportSinceTS", time(0)); struct tm *TM = localtime(&dwSinceDate); struct _SYSTEMTIME ST = { 0 }; @@ -329,7 +329,7 @@ void CMirandaAdvOptionsPageDlg::OnNext() dwSinceDate = mktime(&TM); - db_set_dw(NULL, IMPORT_MODULE, "ImportSinceTS", dwSinceDate); + g_plugin.setDword("ImportSinceTS", dwSinceDate); } } diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index 8d99fcd3ab..ab5a45d246 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -76,7 +76,7 @@ void CFinishedPageDlg::OnNext() void CFinishedPageDlg::OnCancel() { if (IsDlgButtonChecked(m_hwnd, IDC_DONTLOADPLUGIN)) - db_set_b(NULL, "PluginDisable", "import", 1); + db_set_b(0, "PluginDisable", "import", 1); CWizardPageDlg::OnCancel(); } -- cgit v1.2.3