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/FingerprintNG/src/finger_groups.h | 44 +++++++++++++++---------------- plugins/FingerprintNG/src/fingerprint.cpp | 8 +++--- plugins/FingerprintNG/src/options.cpp | 4 +-- 3 files changed, 28 insertions(+), 28 deletions(-) (limited to 'plugins/FingerprintNG') diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index c0ef7d0c1b..99cad38788 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -1,110 +1,110 @@ case MIRANDA_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMiranda", 1)) + if (g_plugin.getByte("GroupMiranda", 1)) return LPGENW("Client icons") L"/" LPGENW("Miranda clients"); break; case MIRANDA_VERSION_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 1)) + if (g_plugin.getByte("GroupMirandaVersion", 1)) return LPGENW("Client icons") L"/" LPGENW("Miranda clients"); break; case MIRANDA_PACKS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMirandaPacks", 1)) + if (g_plugin.getByte("GroupMirandaPacks", 1)) return LPGENW("Client icons") L"/" LPGENW("Miranda clients") L"/" LPGENW("Pack overlays"); break; case MULTI_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMulti", 1)) + if (g_plugin.getByte("GroupMulti", 1)) return LPGENW("Client icons") L"/" LPGENW("Multi-proto clients"); break; case GG_CASE: - if (db_get_b(NULL, MODULENAME, "GroupGG", 1)) + if (g_plugin.getByte("GroupGG", 1)) return LPGENW("Client icons") L"/" LPGENW("Gadu-Gadu clients"); break; case ICQ_CASE: - if (db_get_b(NULL, MODULENAME, "GroupICQ", 1)) + if (g_plugin.getByte("GroupICQ", 1)) return LPGENW("Client icons") L"/" LPGENW("ICQ clients"); break; case IRC_CASE: - if (db_get_b(NULL, MODULENAME, "GroupIRC", 1)) + if (g_plugin.getByte("GroupIRC", 1)) return LPGENW("Client icons") L"/" LPGENW("IRC clients"); break; case JABBER_CASE: - if (db_get_b(NULL, MODULENAME, "GroupJabber", 1)) + if (g_plugin.getByte("GroupJabber", 1)) return LPGENW("Client icons") L"/" LPGENW("Jabber clients"); break; case MRA_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMRA", 1)) + if (g_plugin.getByte("GroupMRA", 1)) return LPGENW("Client icons") L"/" LPGENW("MRA clients"); break; case MSN_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMSN", 1)) + if (g_plugin.getByte("GroupMSN", 1)) return LPGENW("Client icons") L"/" LPGENW("MSN clients"); break; case QQ_CASE: - if (db_get_b(NULL, MODULENAME, "GroupQQ", 1)) + if (g_plugin.getByte("GroupQQ", 1)) return LPGENW("Client icons") L"/" LPGENW("QQ clients"); break; case RSS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupRSS", 1)) + if (g_plugin.getByte("GroupRSS", 1)) return LPGENW("Client icons") L"/" LPGENW("RSS clients"); break; case WEATHER_CASE: - if (db_get_b(NULL, MODULENAME, "GroupWeather", 1)) + if (g_plugin.getByte("GroupWeather", 1)) return LPGENW("Client icons") L"/" LPGENW("Weather clients"); break; case FACEBOOK_CASE: - if (db_get_b(NULL, MODULENAME, "GroupFacebook", 1)) + if (g_plugin.getByte("GroupFacebook", 1)) return LPGENW("Client icons") L"/" LPGENW("Facebook clients"); break; case VK_CASE: - if (db_get_b(NULL, MODULENAME, "GroupVK", 1)) + if (g_plugin.getByte("GroupVK", 1)) return LPGENW("Client icons") L"/" LPGENW("VKontakte clients"); break; case OTHER_PROTOS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOtherProtos", 1)) + if (g_plugin.getByte("GroupOtherProtos", 1)) return LPGENW("Client icons") L"/" LPGENW("Other protocols"); break; case OTHERS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOthers", 1)) + if (g_plugin.getByte("GroupOthers", 1)) return LPGENW("Client icons") L"/" LPGENW("Other icons"); break; case OVERLAYS_RESOURCE_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysResource", 1)) + if (g_plugin.getByte("GroupOverlaysResource", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Resource"); break; case OVERLAYS_PLATFORM_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysPlatform", 1)) + if (g_plugin.getByte("GroupOverlaysPlatform", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Platform"); break; case OVERLAYS_UNICODE_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1)) + if (g_plugin.getByte("GroupOverlaysUnicode", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Platform"); break; case OVERLAYS_SECURITY_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysSecurity", 1)) + if (g_plugin.getByte("GroupOverlaysSecurity", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Security"); break; case OVERLAYS_PROTO_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysProtos", 1)) + if (g_plugin.getByte("GroupOverlaysProtos", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Protocol"); break; diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 4b41598829..9e40f0641a 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -113,7 +113,7 @@ void RegisterIcons() for (i = 0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++) Prepare(&def_kn_fp_overlays_mask[i], true); - if (db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 0)) { + if (g_plugin.getByte("GroupMirandaVersion", 0)) { for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++) Prepare(&def_kn_fp_overlays2_mask[i], true); } @@ -124,7 +124,7 @@ void RegisterIcons() Prepare(&def_kn_fp_overlays2_mask[i], false); } - if (db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1)) { + if (g_plugin.getByte("GroupOverlaysUnicode", 1)) { for (i = 0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++) Prepare(&def_kn_fp_overlays3_mask[i], true); } @@ -855,7 +855,7 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) static int OnSrmmWindowEvent(WPARAM, LPARAM lParam) { - if (!db_get_b(NULL, MODULENAME, "StatusBarIcon", 1)) + if (!g_plugin.getByte("StatusBarIcon", 1)) return 0; MessageWindowEventData *event = (MessageWindowEventData *)lParam; @@ -895,7 +895,7 @@ int OnModulesLoaded(WPARAM, LPARAM) RegisterIcons(); - if (db_get_b(NULL, MODULENAME, "StatusBarIcon", 1)) { + if (g_plugin.getByte("StatusBarIcon", 1)) { StatusIconData sid = {}; sid.szModule = MODULENAME; sid.flags = MBF_HIDDEN; diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 1e14f09a36..223157e8e0 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -65,12 +65,12 @@ SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); static void LoadDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting, BYTE bDef) { - CheckDlgButton(hwndDlg, idCtrl, db_get_b(NULL, MODULENAME, szSetting, bDef) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, idCtrl, g_plugin.getByte(szSetting, bDef) ? BST_CHECKED : BST_UNCHECKED); } static void StoreDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting) { - db_set_b(NULL, MODULENAME, szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl)); + g_plugin.setByte(szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl)); } static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) -- cgit v1.2.3