db_* functions replaced with g_plugin calls

3 files changed, 26 insertions, 26 deletions

diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index b3a6b10ded..b08d600000 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -263,14 +263,14 @@ static void RestoreOldSettings(void)
 		CallService(MS_POPUP_QUERY, PUQS_ENABLEPOPUPS, 0);

 

 	if (g_bOldSetting & OLD_SOUND)

-		db_set_b(NULL, "Skin", "UseSound", 1);

+		db_set_b(0, "Skin", "UseSound", 1);

 

 	if (g_bOldSetting & OLD_FLTCONT) // show Floating contacts if needed

 	{

 		if (ServiceExists("FloatingContacts/MainHideAllThumbs"))

 			CallService("FloatingContacts/MainHideAllThumbs", 0, 0);

 		else

-			db_set_b(NULL, "FloatingContacts", "HideAll", 0);

+			db_set_b(0, "FloatingContacts", "HideAll", 0);

 	}

 	g_bOldSetting = 0;

 }

@@ -303,7 +303,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 

 			if (g_wMask & OPT_CHANGESTATUS) // is this even needed?

 			{

-				BYTE bReqMode = db_get_b(NULL, MOD_NAME, "stattype", 2);

+				BYTE bReqMode = db_get_b(0, MOD_NAME, "stattype", 2);

 				unsigned uMode = (STATUS_ARR_TO_ID[bReqMode]);

 				DBVARIANT dbVar;

 				if (g_wMask & OPT_USEDEFMSG || db_get_ws(NULL, MOD_NAME, "statmsg", &dbVar)) {

@@ -336,16 +336,16 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 			}

 

 			// disable sounds

-			if ((g_wMask & OPT_DISABLESNDS) && db_get_b(NULL, "Skin", "UseSound", 1)) {

+			if ((g_wMask & OPT_DISABLESNDS) && db_get_b(0, "Skin", "UseSound", 1)) {

 				// save current

 				g_bOldSetting |= OLD_SOUND;

-				db_set_b(NULL, "Skin", "UseSound", 0);

+				db_set_b(0, "Skin", "UseSound", 0);

 			}

 

 			g_bWindowHidden = true;

 

 			g_bOldSetting |= OLD_WASHIDDEN;

-			db_set_b(NULL, MOD_NAME, "OldSetting", g_bOldSetting);

+			db_set_b(0, MOD_NAME, "OldSetting", g_bOldSetting);

 		}

 		return 0;

 

@@ -356,7 +356,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 

 			if (g_wMask & OPT_REQPASS) {  //password request

 				DBVARIANT dbVar;

-				if (!db_get_s(NULL, MOD_NAME, "password", &dbVar)) {

+				if (!db_get_s(0, MOD_NAME, "password", &dbVar)) {

 					g_fPassRequested = true;

 

 					strncpy(g_password, dbVar.pszVal, MAXPASSLEN);

@@ -405,7 +405,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
 			PostMessage(hWnd, WM_MOUSEMOVE, 0, (LPARAM)MAKELONG(2, 2)); // reset core's IDLE

 			g_bWindowHidden = false;

 

-			db_set_b(NULL, MOD_NAME, "OldSetting", 0);

+			db_set_b(0, MOD_NAME, "OldSetting", 0);

 		}

 		return 0;

 	}

@@ -473,7 +473,7 @@ static wchar_t *HokeyVkToName(WORD vkKey)
 

 static wchar_t *GetBossKeyText(void)

 {

-	WORD wHotKey = db_get_w(NULL, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12));

+	WORD wHotKey = db_get_w(0, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12));

 

 	BYTE key = LOBYTE(wHotKey);

 	BYTE shift = HIBYTE(wHotKey);

@@ -599,7 +599,7 @@ static int EnumProtos(WPARAM, LPARAM)
 

 static int MirandaLoaded(WPARAM, LPARAM)

 {

-	g_wMask = db_get_w(NULL, MOD_NAME, "optsmask", DEFAULTSETTING);

+	g_wMask = db_get_w(0, MOD_NAME, "optsmask", DEFAULTSETTING);

 

 	RegisterCoreHotKeys();

 

@@ -660,18 +660,18 @@ static int MirandaLoaded(WPARAM, LPARAM)
 

 int CMPlugin::Load()

 {

-	g_wMaskAdv = db_get_w(NULL, MOD_NAME, "optsmaskadv", 0);

-	g_bOldSetting = db_get_b(NULL, MOD_NAME, "OldSetting", 0);

+	g_wMaskAdv = db_get_w(0, MOD_NAME, "optsmaskadv", 0);

+	g_bOldSetting = db_get_b(0, MOD_NAME, "OldSetting", 0);

 

 	if ((g_bOldSetting & OLD_POPUP) && !(g_wMaskAdv & OPT_RESTORE)) // Restore popup settings if Miranda was crushed or killed in hidden mode and "Restore hiding on startup after failure" option is disabled

 	{

-		if (db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) == 0)

-			db_set_b(NULL, "Popup", "ModuleIsEnabled", 1);

+		if (db_get_b(0, "Popup", "ModuleIsEnabled", 1) == 0)

+			db_set_b(0, "Popup", "ModuleIsEnabled", 1);

 	}

-	if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(NULL, "Popup", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled

+	if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(0, "Popup", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled

 	{

 		g_bOldSetting |= OLD_POPUP;

-		db_set_b(NULL, "Popup", "ModuleIsEnabled", 0);

+		db_set_b(0, "Popup", "ModuleIsEnabled", 0);

 	}

 

 	g_plugin.registerIcon("BossKey", iconList);

diff --git a/plugins/BossKeyPlus/src/BossKeyIdle.cpp b/plugins/BossKeyPlus/src/BossKeyIdle.cpp
index c3d8762199..ba70b6cbdc 100644
--- a/plugins/BossKeyPlus/src/BossKeyIdle.cpp
+++ b/plugins/BossKeyPlus/src/BossKeyIdle.cpp
@@ -54,7 +54,7 @@ VOID CALLBACK IdleTimer(HWND, UINT, UINT_PTR idEvent, DWORD)
 

 void InitIdleTimer()

 {

-	minutes = db_get_b(NULL, MOD_NAME, "time", 10);

+	minutes = db_get_b(0, MOD_NAME, "time", 10);

 	hTimer = SetTimer(nullptr, 0, 2000, IdleTimer);

 }

 

diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp
index 46ebb3832a..39f335cfe3 100644
--- a/plugins/BossKeyPlus/src/Options.cpp
+++ b/plugins/BossKeyPlus/src/Options.cpp
@@ -41,7 +41,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 			DBVARIANT dbVar;

 

-			if (!db_get_s(NULL, MOD_NAME, "password", &dbVar)) {

+			if (!db_get_s(0, MOD_NAME, "password", &dbVar)) {

 				SetDlgItemTextA(hwndDlg, IDC_MAINOPT_PASS, dbVar.pszVal);

 				db_free(&dbVar);

 			}

@@ -57,7 +57,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

 				SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(i, 0));

 

-			SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, db_get_b(NULL, MOD_NAME, "stattype", 2), 0);

+			SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, db_get_b(0, MOD_NAME, "stattype", 2), 0);

 

 			SendMessage(hwndDlg, WM_USER + 60, 0, 0);

 			SendMessage(hwndDlg, WM_USER + 50, 0, 0);

@@ -75,14 +75,14 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 			// write down status type

 			if (IsDlgButtonChecked(hwndDlg, IDC_MAINOPT_CHANGESTATUSBOX) == BST_CHECKED) {

-				db_set_b(NULL, MOD_NAME, "stattype", (BYTE)SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_GETCURSEL, 0, 0));

+				db_set_b(0, MOD_NAME, "stattype", (BYTE)SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_GETCURSEL, 0, 0));

 

 				// status msg, if needed

 				if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_MAINOPT_STATMSG))) { // meaning we should save it

 					wchar_t tszMsg[1025];

 					GetDlgItemText(hwndDlg, IDC_MAINOPT_STATMSG, tszMsg, _countof(tszMsg));

 					if (tszMsg[0] != 0)

-						db_set_ws(NULL, MOD_NAME, "statmsg", tszMsg);

+						db_set_ws(0, MOD_NAME, "statmsg", tszMsg);

 					else // delete current setting

 						db_unset(NULL, MOD_NAME, "statmsg");

 				}

@@ -94,7 +94,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 				char szPass[MAXPASSLEN + 1];

 				GetDlgItemTextA(hwndDlg, IDC_MAINOPT_PASS, szPass, _countof(szPass));

 				if (szPass[0] != 0){

-					db_set_s(NULL, MOD_NAME, "password", szPass);

+					db_set_s(0, MOD_NAME, "password", szPass);

 					wMask |= OPT_REQPASS;

 				}

 			}

@@ -104,7 +104,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			if (IsDlgButtonChecked(hwndDlg, IDC_MAINOPT_USEDEFMSG) == BST_CHECKED)  wMask |= OPT_USEDEFMSG;

 			if (IsDlgButtonChecked(hwndDlg, IDC_MAINOPT_TRAYICON) == BST_CHECKED)  wMask |= OPT_TRAYICON;

 

-			db_set_w(NULL, MOD_NAME, "optsmask", wMask);

+			db_set_w(0, MOD_NAME, "optsmask", wMask);

 			g_wMask = wMask;

 			return true;

 		}

@@ -216,7 +216,7 @@ INT_PTR CALLBACK AdvOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 		{

 			g_fOptionsOpen = true;

 

-			minutes = db_get_b(NULL, MOD_NAME, "time", 10);

+			minutes = db_get_b(0, MOD_NAME, "time", 10);

 			wchar_t szMinutes[4] = { 0 };

 			_itow(minutes, szMinutes, 10);

 			SendDlgItemMessage(hwndDlg, IDC_MAINOPT_TIME, EM_LIMITTEXT, 2, 0);

@@ -257,8 +257,8 @@ INT_PTR CALLBACK AdvOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			GetDlgItemText(hwndDlg, IDC_MAINOPT_TIME, szMinutes, _countof(szMinutes));

 			minutes = _wtoi(szMinutes);

 			if (minutes < 1) minutes = 1;

-			db_set_b(NULL, MOD_NAME, "time", minutes);

-			db_set_w(NULL, MOD_NAME, "optsmaskadv", wMaskAdv);

+			db_set_b(0, MOD_NAME, "time", minutes);

+			db_set_w(0, MOD_NAME, "optsmaskadv", wMaskAdv);

 			g_wMaskAdv = wMaskAdv;

 			return true;

 		}