db_* functions replaced with g_plugin calls

7 files changed, 145 insertions, 145 deletions

diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp
index 5c9c387e4d..61f54354bc 100644
--- a/plugins/WebView/src/main.cpp
+++ b/plugins/WebView/src/main.cpp
@@ -99,9 +99,9 @@ int CMPlugin::Load()
 	hRichEd = LoadLibrary(L"Msftedit.dll");

 

 	/*TIMERS*/

-	if ((db_get_dw(NULL, MODULENAME, REFRESH_KEY, TIME) != 0)) {  

-		timerId = SetTimer(nullptr, 0, ((db_get_dw(NULL, MODULENAME, REFRESH_KEY, TIME)) * MINUTE), timerfunc);

-		db_set_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0); 

+	if ((g_plugin.getDword(REFRESH_KEY, TIME) != 0)) {  

+		timerId = SetTimer(nullptr, 0, ((g_plugin.getDword(REFRESH_KEY, TIME)) * MINUTE), timerfunc);

+		g_plugin.setDword(COUNTDOWN_KEY, 0); 

 		Countdown = SetTimer(nullptr, 0, MINUTE, Countdownfunc);

 	}

 

@@ -124,13 +124,13 @@ int CMPlugin::Load()
 	g_plugin.addSound("webviewalert", _A2W(MODULENAME), LPGENW("Alert event"));

 

 	//value is 1 if menu is disabled

-	db_set_b(NULL, MODULENAME, MENU_IS_DISABLED_KEY, 1);

+	g_plugin.setByte(MENU_IS_DISABLED_KEY, 1);

 

 	CMenuItem mi(&g_plugin);

 	mi.flags = CMIF_UNICODE;

-	if ( db_get_b(NULL, MODULENAME, MENU_OFF, 0)) {

+	if ( g_plugin.getByte(MENU_OFF, 0)) {

 		//value is 0 if menu is enabled

-		db_set_b(NULL, MODULENAME, MENU_IS_DISABLED_KEY, 0);

+		g_plugin.setByte(MENU_IS_DISABLED_KEY, 0);

 

 		mi.root = g_plugin.addRootMenu(MO_MAIN, _A2W(MODULENAME), 20200001);

 		Menu_ConfigureItem(mi.root, MCI_OPT_UID, "403BE07B-7954-4F3E-B318-4301571776B8");

@@ -139,7 +139,7 @@ int CMPlugin::Load()
 		SET_UID(mi, 0xdedeb697, 0xfc10, 0x4622, 0x8b, 0x97, 0x74, 0x39, 0x32, 0x68, 0xa7, 0x7b);

 		CreateServiceFunction("DisableWebview", AutoUpdateMCmd);

 		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_SITE));

-		if (db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0))

+		if (g_plugin.getByte(DISABLE_AUTOUPDATE_KEY, 0))

 			mi.name.w = LPGENW("Auto update disabled");

 		else

 			mi.name.w = LPGENW("Auto update enabled"); 

@@ -178,7 +178,7 @@ int CMPlugin::Load()
 		CreateServiceFunction("Countdown", CountdownMenuCommand);

 		mi.flags |= CMIF_KEEPUNTRANSLATED;

 		wchar_t countername[100];

-		mir_snwprintf(countername, TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

+		mir_snwprintf(countername, TranslateT("%d minutes to update"), g_plugin.getDword(COUNTDOWN_KEY, 0));

 		mi.position = 600090099;

 		mi.hIcolibItem = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_UPDATEALL));

 		mi.name.w = countername;

@@ -246,7 +246,7 @@ int CMPlugin::Load()
 	HookEvent(ME_DB_CONTACT_DELETED, SiteDeleted);

 	HookEvent(ME_OPT_INITIALISE, OptInitialise);

 

-	db_set_b(NULL, MODULENAME, HAS_CRASHED_KEY, 1);

+	g_plugin.setByte(HAS_CRASHED_KEY, 1);

 	return 0;

 }

 

@@ -259,7 +259,7 @@ int CMPlugin::Unload()
 	KillTimer(nullptr, timerId);

 	KillTimer(nullptr, Countdown);

 

-	db_set_b(NULL, MODULENAME, HAS_CRASHED_KEY, 0);

+	g_plugin.setByte(HAS_CRASHED_KEY, 0);

 	SavewinSettings();

 	if (hRichEd)

 		FreeLibrary(hRichEd);

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index f70712bc45..0edd6fa306 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -47,7 +47,7 @@ void ChangeMenuItem1()
 {

 	// Enable or Disable auto updates

 	LPCTSTR ptszName;

-	if (!db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0))

+	if (!g_plugin.getByte(DISABLE_AUTOUPDATE_KEY, 0))

 		ptszName = LPGENW("Auto update enabled");

 	else

 		ptszName = LPGENW("Auto update disabled");

@@ -62,7 +62,7 @@ void ChangeMenuItemCountdown()
 	HICON hIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_UPDATEALL));

 

 	wchar_t countername[100];

-	mir_snwprintf(countername, TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

+	mir_snwprintf(countername, TranslateT("%d minutes to update"), g_plugin.getDword(COUNTDOWN_KEY, 0));

 

 	Menu_ModifyItem(hMenuItemCountdown, countername, hIcon, CMIF_KEEPUNTRANSLATED);

 }

@@ -114,7 +114,7 @@ void BGclrLoop()
 void StartUpdate(void*)

 {

 	StartUpDelay = 1;

-	Sleep(((db_get_dw(NULL, MODULENAME, START_DELAY_KEY, 0)) * SECOND));

+	Sleep(((g_plugin.getDword(START_DELAY_KEY, 0)) * SECOND));

 

 	for (auto &hContact : Contacts(MODULENAME))

 		GetData((void*)hContact);

@@ -145,8 +145,8 @@ INT_PTR MarkAllReadMenuCommand(WPARAM, LPARAM)
 /*****************************************************************************/

 void InitialiseGlobals(void)

 {

-	Xposition = db_get_dw(NULL, MODULENAME, Xpos_WIN_KEY, 0);

-	Yposition = db_get_dw(NULL, MODULENAME, Ypos_WIN_KEY, 0);

+	Xposition = g_plugin.getDword(Xpos_WIN_KEY, 0);

+	Yposition = g_plugin.getDword(Ypos_WIN_KEY, 0);

 

 	if (Yposition == -32000)

 		Yposition = 100;

@@ -154,11 +154,11 @@ void InitialiseGlobals(void)
 	if (Xposition == -32000)

 		Xposition = 100;

 

-	BackgoundClr = db_get_dw(NULL, MODULENAME, BG_COLOR_KEY, Def_color_bg);

-	TextClr = db_get_dw(NULL, MODULENAME, TXT_COLOR_KEY, Def_color_txt);

+	BackgoundClr = g_plugin.getDword(BG_COLOR_KEY, Def_color_bg);

+	TextClr = g_plugin.getDword(TXT_COLOR_KEY, Def_color_txt);

 

-	WindowHeight = db_get_dw(NULL, MODULENAME, WIN_HEIGHT_KEY, Def_win_height);

-	WindowWidth = db_get_dw(NULL, MODULENAME, WIN_WIDTH_KEY, Def_win_width);

+	WindowHeight = g_plugin.getDword(WIN_HEIGHT_KEY, Def_win_height);

+	WindowWidth = g_plugin.getDword(WIN_WIDTH_KEY, Def_win_width);

 }

 

 /*****************************************************************************/

@@ -187,7 +187,7 @@ int Doubleclick(WPARAM wParam, LPARAM)
 			HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

 			SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)((HICON)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

 

-			if (db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

+			if (g_plugin.getByte(SAVE_INDIVID_POS_KEY, 0))

 				SetWindowPos(hwndDlg, hTopmost,

 					db_get_dw(hContact, MODULENAME, "WVx", 100), // Xposition,

 					db_get_dw(hContact, MODULENAME, "WVy", 100), // Yposition,

@@ -200,7 +200,7 @@ int Doubleclick(WPARAM wParam, LPARAM)
 		ShowWindow(hwndDlg, SW_SHOW);

 		SetActiveWindow(hwndDlg);

 

-		if (db_get_b(NULL, MODULENAME, UPDATE_ON_OPEN_KEY, 0)) {

+		if (g_plugin.getByte(UPDATE_ON_OPEN_KEY, 0)) {

 			if (db_get_b(hContact, MODULENAME, ENABLE_ALERTS_KEY, 0))

 				mir_forkthread(ReadFromFile, (void*)hContact);

 			else

@@ -227,28 +227,28 @@ int SendToRichEdit(HWND hWindow, char *truncated, COLORREF rgbText, COLORREF rgb
 	cfFM.cbSize = sizeof(CHARFORMAT2);

 	cfFM.dwMask = CFM_COLOR | CFM_CHARSET | CFM_FACE | ENM_LINK | ENM_MOUSEEVENTS | CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_SIZE;

 

-	if (db_get_b(NULL, MODULENAME, FONT_BOLD_KEY, 0))

+	if (g_plugin.getByte(FONT_BOLD_KEY, 0))

 		bold = CFE_BOLD;

 

-	if (db_get_b(NULL, MODULENAME, FONT_ITALIC_KEY, 0))

+	if (g_plugin.getByte(FONT_ITALIC_KEY, 0))

 		italic = CFE_ITALIC;

 

-	if (db_get_b(NULL, MODULENAME, FONT_UNDERLINE_KEY, 0))

+	if (g_plugin.getByte(FONT_UNDERLINE_KEY, 0))

 		underline = CFE_UNDERLINE;

 

 	cfFM.dwEffects = bold | italic | underline;

 

-	if (!db_get_ws(NULL, MODULENAME, FONT_FACE_KEY, &dbv)) {

+	if (!g_plugin.getWString(FONT_FACE_KEY, &dbv)) {

 		mir_wstrcpy(cfFM.szFaceName, dbv.pwszVal);

 		db_free(&dbv);

 	}

 	else mir_wstrcpy(cfFM.szFaceName, Def_font_face);

 

 	HDC hDC = GetDC(hWindow);

-	cfFM.yHeight = (BYTE)MulDiv(abs(g_lf.lfHeight), 120, GetDeviceCaps(GetDC(hWindow), LOGPIXELSY)) * (db_get_b(NULL, MODULENAME, FONT_SIZE_KEY, 14));

+	cfFM.yHeight = (BYTE)MulDiv(abs(g_lf.lfHeight), 120, GetDeviceCaps(GetDC(hWindow), LOGPIXELSY)) * (g_plugin.getByte(FONT_SIZE_KEY, 14));

 	ReleaseDC(hWindow, hDC);

 

-	cfFM.bCharSet = db_get_b(NULL, MODULENAME, FONT_SCRIPT_KEY, 0);

+	cfFM.bCharSet = g_plugin.getByte(FONT_SCRIPT_KEY, 0);

 	cfFM.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

 	cfFM.crTextColor = rgbText;

 	cfFM.crBackColor = rgbBack;

@@ -263,25 +263,25 @@ int SendToRichEdit(HWND hWindow, char *truncated, COLORREF rgbText, COLORREF rgb
 /*****************************************************************************/

 void CALLBACK timerfunc(HWND, UINT, UINT_PTR, DWORD)

 {

-	db_set_b(NULL, MODULENAME, HAS_CRASHED_KEY, 0);

+	g_plugin.setByte(HAS_CRASHED_KEY, 0);

 

-	if (!(db_get_b(NULL, MODULENAME, OFFLINE_STATUS, 1)))

-		if (!(db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0)))

+	if (!(g_plugin.getByte(OFFLINE_STATUS, 1)))

+		if (!(g_plugin.getByte(DISABLE_AUTOUPDATE_KEY, 0)))

 			mir_forkthread(ContactLoop);

 

-	db_set_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0);

+	g_plugin.setDword(COUNTDOWN_KEY, 0);

 }

 

 /*****************************************************************************/

 void CALLBACK Countdownfunc(HWND, UINT, UINT_PTR, DWORD)

 {

-	DWORD timetemp = db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 100);

+	DWORD timetemp = g_plugin.getDword(COUNTDOWN_KEY, 100);

 	if (timetemp <= 0) {

-		timetemp = db_get_dw(NULL, MODULENAME, REFRESH_KEY, TIME);

-		db_set_dw(NULL, MODULENAME, COUNTDOWN_KEY, timetemp);

+		timetemp = g_plugin.getDword(REFRESH_KEY, TIME);

+		g_plugin.setDword(COUNTDOWN_KEY, timetemp);

 	}

 

-	db_set_dw(NULL, MODULENAME, COUNTDOWN_KEY, timetemp - 1);

+	g_plugin.setDword(COUNTDOWN_KEY, timetemp - 1);

 

 	ChangeMenuItemCountdown();

 }

@@ -346,7 +346,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 	h_font = CreateFontIndirect(&g_lf);

 

 	// get data on startup

-	if (db_get_b(NULL, MODULENAME, UPDATE_ONSTART_KEY, 0))

+	if (g_plugin.getByte(UPDATE_ONSTART_KEY, 0))

 		mir_forkthread(StartUpdate);

 

 	return 0;

@@ -365,7 +365,7 @@ INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM)
 	HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

 	hwndDlg = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, (LPARAM)hContact);

 	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));

-	if (db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

+	if (g_plugin.getByte(SAVE_INDIVID_POS_KEY, 0))

 		SetWindowPos(hwndDlg, hTopmost,

 			db_get_dw(hContact, MODULENAME, "WVx", 100), // Xposition,

 			db_get_dw(hContact, MODULENAME, "WVy", 100), // Yposition,

@@ -377,7 +377,7 @@ INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM)
 	ShowWindow(hwndDlg, SW_SHOW);

 	SetActiveWindow(hwndDlg);

 

-	if (db_get_b(NULL, MODULENAME, UPDATE_ON_OPEN_KEY, 0)) {

+	if (g_plugin.getByte(UPDATE_ON_OPEN_KEY, 0)) {

 		if (db_get_b(hContact, MODULENAME, ENABLE_ALERTS_KEY, 0))

 			mir_forkthread(ReadFromFile, (void*)hContact);

 		else

@@ -398,10 +398,10 @@ INT_PTR UpdateAllMenuCommand(WPARAM, LPARAM)
 /*****************************************************************************/

 INT_PTR AutoUpdateMCmd(WPARAM, LPARAM)

 {

-	if (db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0))

-		db_set_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0);

+	if (g_plugin.getByte(DISABLE_AUTOUPDATE_KEY, 0))

+		g_plugin.setByte(DISABLE_AUTOUPDATE_KEY, 0);

 	else

-		db_set_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 1);

+		g_plugin.setByte(DISABLE_AUTOUPDATE_KEY, 1);

 

 	ChangeMenuItem1();

 	return 0;

@@ -410,7 +410,7 @@ INT_PTR AutoUpdateMCmd(WPARAM, LPARAM)
 /*****************************************************************************/

 INT_PTR AddContactMenuCommand(WPARAM, LPARAM)

 {

-	db_set_s(NULL, "FindAdd", "LastSearched", MODULENAME);

+	db_set_s(0, "FindAdd", "LastSearched", MODULENAME);

 	CallService(MS_FINDADD_FINDADD, 0, 0);

 	return 0;

 }

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index ad281c4b3c..56b7db8e0d 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -35,19 +35,19 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		if (message == WM_COMMAND) { // left click

 			if(hContact != NULL) { 

 				// open data window

-				if ( db_get_b(NULL, MODULENAME, LCLK_WINDOW_KEY, 0)) {

+				if ( g_plugin.getByte(LCLK_WINDOW_KEY, 0)) {

 					NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

 					mir_forkthread(GetData, (void*)hContact);

 					PUDeletePopup(hWnd);

 				}

 				// open url

-				if (db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) {

+				if (g_plugin.getByte(LCLK_WEB_PGE_KEY, 0)) {

 					Utils_OpenUrlW(url);

 					PUDeletePopup(hWnd);

 					db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 				}

 				// dismiss

-				if (db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1))

+				if (g_plugin.getByte(LCLK_DISMISS_KEY, 1))

 					PUDeletePopup(hWnd);

 			}	

 			else if (hContact == NULL)

@@ -56,19 +56,19 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		else if (message == WM_CONTEXTMENU) { // right click

 			if (hContact != NULL) {   

 				// open datA window

-				if (db_get_b(NULL, MODULENAME, RCLK_WINDOW_KEY, 0)) {

+				if (g_plugin.getByte(RCLK_WINDOW_KEY, 0)) {

 					NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

 					mir_forkthread(GetData, (void*)hContact);

 					PUDeletePopup(hWnd);

 				}

 				// open url

-				if (db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) {

+				if (g_plugin.getByte(RCLK_WEB_PGE_KEY, 1)) {

 					Utils_OpenUrlW(url);

 					PUDeletePopup(hWnd);

 					db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

 				}

 				// dismiss

-				if ( db_get_b(NULL, MODULENAME, RCLK_DISMISS_KEY, 0))

+				if ( g_plugin.getByte(RCLK_DISMISS_KEY, 0))

 					PUDeletePopup(hWnd);

 			}

 			else if(hContact == NULL)

@@ -130,21 +130,21 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 	else if (mir_wstrlen(displaytext) < MAX_SECONDLINE)

 		mir_snwprintf(ppd.lptzText, displaytext);

 

-	if ( db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)) {

-		ppd.colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, Def_color_bg);

-		ppd.colorText = db_get_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, Def_color_txt);

+	if ( g_plugin.getByte(POP_USECUSTCLRS_KEY, 0)) {

+		ppd.colorBack = g_plugin.getDword(POP_BG_CLR_KEY, Def_color_bg);

+		ppd.colorText = g_plugin.getDword(POP_TXT_CLR_KEY, Def_color_txt);

 	}

-	else if ( db_get_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, 0)) {

+	else if ( g_plugin.getByte(POP_USEWINCLRS_KEY, 0)) {

 		ppd.colorBack = GetSysColor(COLOR_BTNFACE);

 		ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

 	}

-	else if ( db_get_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, 1)) {

+	else if ( g_plugin.getByte(POP_USESAMECLRS_KEY, 1)) {

 		ppd.colorBack = BackgoundClr;

 		ppd.colorText = TextClr;

 	}

 

 	ppd.PluginWindowProc = nullptr;

-	ppd.iSeconds = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

+	ppd.iSeconds = g_plugin.getDword(POP_DELAY_KEY, 0);

 

 	if (ServiceExists(MS_POPUP_ADDPOPUPT))

 		CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&ppd, 0);

@@ -183,15 +183,15 @@ int ErrorMsgs(WPARAM wParam, LPARAM lParam)
 	MCONTACT hContact = wParam;

 	wchar_t newdisplaytext[2000], *displaytext = (wchar_t*)lParam;

 

-	if (db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0))

+	if (g_plugin.getByte(SUPPRESS_ERR_KEY, 0))

 		return 0;

 

 	wchar_t *ptszContactName = Clist_GetContactDisplayName(hContact);

-	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT) && g_plugin.getByte(ERROR_POPUP_KEY, 0)) {

 		mir_snwprintf(newdisplaytext, L"%s\n%s", ptszContactName, displaytext);

 		PUShowMessageT(newdisplaytext, SM_WARNING);

 	}

-	else if ( ServiceExists("OSD/Announce") && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

+	else if ( ServiceExists("OSD/Announce") && g_plugin.getByte(ERROR_POPUP_KEY, 0)) {

 		mir_snwprintf(newdisplaytext, L"%s: %s", ptszContactName, TranslateW(displaytext));

 		CallService("OSD/Announce", (WPARAM)newdisplaytext, 0);

 	}

@@ -766,7 +766,7 @@ int DataWndAlertCommand(WPARAM wParam, LPARAM)
 	HWND hwndDlg = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_DISPLAY_DATA), nullptr, DlgProcDisplayData, hContact);

 	HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

 	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) ((HICON) LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

-	if ( db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

+	if ( g_plugin.getByte(SAVE_INDIVID_POS_KEY, 0))

 		SetWindowPos(hwndDlg, hTopmost,

 			db_get_dw(hContact, MODULENAME, "WVx", 100), // Xposition,

 			db_get_dw(hContact, MODULENAME, "WVy", 100), // Yposition,

diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp
index 4b70e7c2cb..ae30c5d20f 100644
--- a/plugins/WebView/src/webview_datawnd.cpp
+++ b/plugins/WebView/src/webview_datawnd.cpp
@@ -240,7 +240,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			SendDlgItemMessage(hwndDlg, IDC_STATUSBAR, SB_SETPARTS, _countof(partWidth), (LPARAM)partWidth);

 			SendDlgItemMessage(hwndDlg, IDC_STATUSBAR, SB_SETTEXT, 1 | SBT_OWNERDRAW, 0);

 

-			if ( db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

+			if ( g_plugin.getByte(SAVE_INDIVID_POS_KEY, 0))

 				Utils_RestoreWindowPosition(hwndDlg, hContact2, MODULENAME, "WV");

 		}

 		break;

@@ -476,13 +476,13 @@ void SavewinSettings(void)
 	if (Xposition == -32000)

 		Xposition = 100;

 

-	db_set_dw(NULL, MODULENAME, Xpos_WIN_KEY,   Xposition);

-	db_set_dw(NULL, MODULENAME, Ypos_WIN_KEY,   Yposition);

+	g_plugin.setDword(Xpos_WIN_KEY,   Xposition);

+	g_plugin.setDword(Ypos_WIN_KEY,   Yposition);

 

-	db_set_dw(NULL, MODULENAME, BG_COLOR_KEY,   BackgoundClr);

-	db_set_dw(NULL, MODULENAME, TXT_COLOR_KEY,  TextClr);

-	db_set_dw(NULL, MODULENAME, WIN_HEIGHT_KEY, WindowHeight);

-	db_set_dw(NULL, MODULENAME, WIN_WIDTH_KEY,  WindowWidth);

+	g_plugin.setDword(BG_COLOR_KEY,   BackgoundClr);

+	g_plugin.setDword(TXT_COLOR_KEY,  TextClr);

+	g_plugin.setDword(WIN_HEIGHT_KEY, WindowHeight);

+	g_plugin.setDword(WIN_WIDTH_KEY,  WindowWidth);

 

 }

 

diff --git a/plugins/WebView/src/webview_getdata.cpp b/plugins/WebView/src/webview_getdata.cpp
index 3d8a3db19c..590f0d4fdc 100644
--- a/plugins/WebView/src/webview_getdata.cpp
+++ b/plugins/WebView/src/webview_getdata.cpp
@@ -84,7 +84,7 @@ void GetData(void *param)
 	url[0] = '\0';

 

 	if (!Startingup)

-		db_set_b(NULL, MODULENAME, HAS_CRASHED_KEY, 1);

+		g_plugin.setByte(HAS_CRASHED_KEY, 1);

 

 	if (!db_get_s(hContact, MODULENAME, START_STRING_KEY, &dbv)) {

 		strncpy_s(tempstring, _countof(tempstring), dbv.pszVal, _TRUNCATE);

@@ -119,7 +119,7 @@ void GetData(void *param)
 

 	nlhr.headers = headers;

 

-	if ( db_get_b(NULL, MODULENAME, NO_PROTECT_KEY, 0)) // disable 

+	if ( g_plugin.getByte(NO_PROTECT_KEY, 0)) // disable 

 		AlreadyDownloading = 0;

 

 	// //try site////

@@ -421,7 +421,7 @@ LBL_Stop:			wchar_t *statusText = TranslateT("Processing data stopped by user.")
 

 					//data in popup 

 					if (TherewasAlert)

-						if ( db_get_b(NULL, MODULENAME, DATA_POPUP_KEY, 0))

+						if ( g_plugin.getByte(DATA_POPUP_KEY, 0))

 							WAlertPopup(hContact, _A2T(truncated));  

 

 					if (db_get_b(hContact, MODULENAME, STOP_KEY, 1) == 1)

@@ -472,7 +472,7 @@ LBL_Stop:			wchar_t *statusText = TranslateT("Processing data stopped by user.")
 

 		// update window if the update only on alert option isn't ticked or

 		// there was an alert or the update button was clicked

-		if ((!(db_get_b(NULL, MODULENAME, UPDATE_ONALERT_KEY, 0))) || (TherewasAlert == 1) || (PosButnClick == 1)) {

+		if ((!(g_plugin.getByte(UPDATE_ONALERT_KEY, 0))) || (TherewasAlert == 1) || (PosButnClick == 1)) {

 			SendToRichEdit(hwndDlg, truncated, TextClr, BackgoundClr);

 

 			if (TherewasAlert) {

@@ -483,8 +483,8 @@ LBL_Stop:			wchar_t *statusText = TranslateT("Processing data stopped by user.")
 					SendDlgItemMessage(hwndDlg, IDC_DATA, EM_EXSETSEL, 0, (LPARAM)&sel2);

 					SetFocus(GetDlgItem(hwndDlg, IDC_DATA));

 

-					DWORD HiBackgoundClr = db_get_dw(NULL, MODULENAME, BG_COLOR_KEY, Def_color_bg);

-					DWORD HiTextClr = db_get_dw(NULL, MODULENAME, TXT_COLOR_KEY, Def_color_txt);

+					DWORD HiBackgoundClr = g_plugin.getDword(BG_COLOR_KEY, Def_color_bg);

+					DWORD HiTextClr = g_plugin.getDword(TXT_COLOR_KEY, Def_color_txt);

 

 					CHARFORMAT2 Format;

 					memset(&Format, 0, sizeof(Format));

@@ -507,5 +507,5 @@ LBL_Stop:			wchar_t *statusText = TranslateT("Processing data stopped by user.")
 	EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATE_BUTTON), 1);

 

 	if (!Startingup)

-		db_set_b(NULL, MODULENAME, HAS_CRASHED_KEY, 0);

+		g_plugin.setByte(HAS_CRASHED_KEY, 0);

 }

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index 27091fd65b..a6011d7074 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -102,36 +102,36 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hdlg);

 

-		delay = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

+		delay = g_plugin.getDword(POP_DELAY_KEY, 0);

 

 		// setting popup delay option

 		_itoa(delay, str, 10);

 		SetDlgItemTextA(hdlg, IDC_DELAY, str);

 

-		BGColour = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, Def_color_bg);

-		TextColour = db_get_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, Def_color_txt);

+		BGColour = g_plugin.getDword(POP_BG_CLR_KEY, Def_color_bg);

+		TextColour = g_plugin.getDword(POP_TXT_CLR_KEY, Def_color_txt);

 

 		// Colours. First step is configuring the colours.

 		SendDlgItemMessage(hdlg, IDC_POP_BGCOLOUR, CPM_SETCOLOUR, 0, BGColour);

 		SendDlgItemMessage(hdlg, IDC_POP_TEXTCOLOUR, CPM_SETCOLOUR, 0, TextColour);

 		// Second step is disabling them if we want to use default Windows

 		// ones.

-		CheckDlgButton(hdlg, IDC_POP_USEWINCOLORS, db_get_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hdlg, IDC_POP_USESAMECOLORS, db_get_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, 1) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hdlg, IDC_POP_USECUSTCOLORS, db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_POP_USEWINCOLORS, g_plugin.getByte(POP_USEWINCLRS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_POP_USESAMECOLORS, g_plugin.getByte(POP_USESAMECLRS_KEY, 1) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_POP_USECUSTCOLORS, g_plugin.getByte(POP_USECUSTCLRS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

 

 		if (IsDlgButtonChecked(hdlg, IDC_POP_USEWINCOLORS) || IsDlgButtonChecked(hdlg, IDC_POP_USESAMECOLORS)) {

 			EnableWindow(GetDlgItem(hdlg, IDC_POP_BGCOLOUR), 0);

 			EnableWindow(GetDlgItem(hdlg, IDC_POP_TEXTCOLOUR), 0);

 		}

 

-		CheckDlgButton(hdlg, IDC_LCLK_WINDOW, db_get_b(NULL, MODULENAME, LCLK_WINDOW_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hdlg, IDC_LCLK_WEB_PGE, db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hdlg, IDC_LCLK_DISMISS, db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_LCLK_WINDOW, g_plugin.getByte(LCLK_WINDOW_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_LCLK_WEB_PGE, g_plugin.getByte(LCLK_WEB_PGE_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_LCLK_DISMISS, g_plugin.getByte(LCLK_DISMISS_KEY, 1) ? BST_CHECKED : BST_UNCHECKED);

 

-		CheckDlgButton(hdlg, IDC_RCLK_WINDOW, db_get_b(NULL, MODULENAME, RCLK_WINDOW_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hdlg, IDC_RCLK_WEB_PGE, db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hdlg, IDC_RCLK_DISMISS, db_get_b(NULL, MODULENAME, RCLK_DISMISS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_RCLK_WINDOW, g_plugin.getByte(RCLK_WINDOW_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_RCLK_WEB_PGE, g_plugin.getByte(RCLK_WEB_PGE_KEY, 1) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_RCLK_DISMISS, g_plugin.getByte(RCLK_DISMISS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

 		return TRUE;

 

 	case WM_COMMAND:

@@ -224,25 +224,25 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			GetDlgItemText(hdlg, IDC_DELAY, str2, _countof(str2));

 

 			popupdelayval = _wtol(str2);

-			db_set_dw(NULL, MODULENAME, POP_DELAY_KEY, popupdelayval);

+			g_plugin.setDword(POP_DELAY_KEY, popupdelayval);

 

-			db_set_b(NULL, MODULENAME, LCLK_WINDOW_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_LCLK_WINDOW));

-			db_set_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_LCLK_WEB_PGE));

-			db_set_b(NULL, MODULENAME, LCLK_DISMISS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_LCLK_DISMISS));

+			g_plugin.setByte(LCLK_WINDOW_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_LCLK_WINDOW));

+			g_plugin.setByte(LCLK_WEB_PGE_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_LCLK_WEB_PGE));

+			g_plugin.setByte(LCLK_DISMISS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_LCLK_DISMISS));

 

-			db_set_b(NULL, MODULENAME, RCLK_WINDOW_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_RCLK_WINDOW));

-			db_set_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_RCLK_WEB_PGE));

-			db_set_b(NULL, MODULENAME, RCLK_DISMISS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_RCLK_DISMISS));

+			g_plugin.setByte(RCLK_WINDOW_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_RCLK_WINDOW));

+			g_plugin.setByte(RCLK_WEB_PGE_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_RCLK_WEB_PGE));

+			g_plugin.setByte(RCLK_DISMISS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_RCLK_DISMISS));

 

-			db_set_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_POP_USECUSTCOLORS));

-			db_set_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_POP_USEWINCOLORS));

-			db_set_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_POP_USESAMECOLORS));

+			g_plugin.setByte(POP_USECUSTCLRS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_POP_USECUSTCOLORS));

+			g_plugin.setByte(POP_USEWINCLRS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_POP_USEWINCOLORS));

+			g_plugin.setByte(POP_USESAMECLRS_KEY, (BYTE)IsDlgButtonChecked(hdlg, IDC_POP_USESAMECOLORS));

 

 			BGColour = (SendDlgItemMessage(hdlg, IDC_POP_BGCOLOUR, CPM_GETCOLOUR, 0, 0));

 			TextColour = (SendDlgItemMessage(hdlg, IDC_POP_TEXTCOLOUR, CPM_GETCOLOUR, 0, 0));

 

-			db_set_dw(NULL, MODULENAME, POP_BG_CLR_KEY, BGColour);

-			db_set_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, TextColour);

+			g_plugin.setDword(POP_BG_CLR_KEY, BGColour);

+			g_plugin.setDword(POP_TXT_CLR_KEY, TextColour);

 

 			test = 0;

 			return TRUE;

@@ -1043,26 +1043,26 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			SendDlgItemMessage(hwndDlg, IDC_SPIN1, UDM_SETRANGE, 0, MAKELONG(999, 0));

 			SendDlgItemMessage(hwndDlg, IDC_SPIN2, UDM_SETRANGE, 0, MAKELONG(120, 0));

 

-			SetDlgItemInt(hwndDlg, IDC_TIME, db_get_dw(NULL, MODULENAME, REFRESH_KEY, TIME), FALSE);

-			SetDlgItemInt(hwndDlg, IDC_START_DELAY, db_get_w(NULL, MODULENAME, START_DELAY_KEY, 0), FALSE);

+			SetDlgItemInt(hwndDlg, IDC_TIME, g_plugin.getDword(REFRESH_KEY, TIME), FALSE);

+			SetDlgItemInt(hwndDlg, IDC_START_DELAY, g_plugin.getWord(START_DELAY_KEY, 0), FALSE);

 

 			mir_forkthread(FillFontListThread, hwndDlg);

 

-			CheckDlgButton(hwndDlg, IDC_DISABLEMENU, db_get_b(NULL, MODULENAME, MENU_OFF, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SUPPRESS, db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_UPDATE_ONSTART, db_get_b(NULL, MODULENAME, UPDATE_ONSTART_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_UPDATE_ON_OPEN, db_get_b(NULL, MODULENAME, UPDATE_ON_OPEN_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_HIDE_STATUS_ICON, db_get_b(NULL, MODULENAME, HIDE_STATUS_ICON_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_FONT_BOLD, db_get_b(NULL, MODULENAME, FONT_BOLD_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_FONT_ITALIC, db_get_b(NULL, MODULENAME, FONT_ITALIC_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_FONT_UNDERLINE, db_get_b(NULL, MODULENAME, FONT_UNDERLINE_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_ERROR_POPUP, db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_UPDATE_ONALERT, db_get_b(NULL, MODULENAME, UPDATE_ONALERT_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_SAVE_INDIVID_POS, db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_NO_PROTECT, db_get_b(NULL, MODULENAME, NO_PROTECT_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_DATAPOPUP, db_get_b(NULL, MODULENAME, DATA_POPUP_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

-

-			if (!db_get_ws(NULL, MODULENAME, FONT_FACE_KEY, &dbv)) {

+			CheckDlgButton(hwndDlg, IDC_DISABLEMENU, g_plugin.getByte(MENU_OFF, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_SUPPRESS, g_plugin.getByte(SUPPRESS_ERR_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_UPDATE_ONSTART, g_plugin.getByte(UPDATE_ONSTART_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_UPDATE_ON_OPEN, g_plugin.getByte(UPDATE_ON_OPEN_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_HIDE_STATUS_ICON, g_plugin.getByte(HIDE_STATUS_ICON_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_FONT_BOLD, g_plugin.getByte(FONT_BOLD_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_FONT_ITALIC, g_plugin.getByte(FONT_ITALIC_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_FONT_UNDERLINE, g_plugin.getByte(FONT_UNDERLINE_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_ERROR_POPUP, g_plugin.getByte(ERROR_POPUP_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_UPDATE_ONALERT, g_plugin.getByte(UPDATE_ONALERT_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_SAVE_INDIVID_POS, g_plugin.getByte(SAVE_INDIVID_POS_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_NO_PROTECT, g_plugin.getByte(NO_PROTECT_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_DATAPOPUP, g_plugin.getByte(DATA_POPUP_KEY, 0) ? BST_CHECKED : BST_UNCHECKED);

+

+			if (!g_plugin.getWString(FONT_FACE_KEY, &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_TYPEFACE, dbv.pwszVal);

 				db_free(&dbv);

 			}

@@ -1073,7 +1073,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 

 			SendMessage(hwndDlg, M_FILLSCRIPTCOMBO, wParam, 0);

 

-			SetDlgItemInt(hwndDlg, IDC_FONTSIZE, db_get_b(NULL, MODULENAME, FONT_SIZE_KEY, 14), FALSE);

+			SetDlgItemInt(hwndDlg, IDC_FONTSIZE, g_plugin.getByte(FONT_SIZE_KEY, 14), FALSE);

 

 			EnableWindow(GetDlgItem(hwndDlg, IDC_FIND_BUTTON), 0);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_ALERT_BUTTON), 0);

@@ -1086,7 +1086,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			*/

 			oldcolor = BackgoundClr;

 

-			if (db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0)) {

+			if (g_plugin.getByte(SUPPRESS_ERR_KEY, 0)) {

 				CheckDlgButton(hwndDlg, IDC_SUPPRESS, BST_CHECKED);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 0);

 			}

@@ -1099,7 +1099,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			if (ServiceExists(MS_POPUP_ADDPOPUPT) == 0)

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 0);

 

-			if (db_get_b(NULL, MODULENAME, UPDATE_ONSTART_KEY, 0)) {

+			if (g_plugin.getByte(UPDATE_ONSTART_KEY, 0)) {

 				EnableWindow(GetDlgItem(hwndDlg, IDC_START_DELAY), 1);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_SPIN2), 1);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_STARTDELAYTXT), 1);

@@ -1129,7 +1129,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)EnumFontScriptsProc, (LPARAM)GetDlgItem(hwndDlg, IDC_SCRIPT), 0);

 			ReleaseDC(hwndDlg, hdc);

 			for (i = SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETCOUNT, 0, 0) - 1; i >= 0; i--) {

-				if (SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETITEMDATA, i, 0) == (BYTE)((db_get_b(NULL, MODULENAME, FONT_SCRIPT_KEY, 0)))) {

+				if (SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETITEMDATA, i, 0) == (BYTE)((g_plugin.getByte(FONT_SCRIPT_KEY, 0)))) {

 					SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_SETCURSEL, i, 0);

 					break;

 				}

@@ -1146,7 +1146,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 		switch (LOWORD(wParam)) {

 		case IDC_TXTCOLOR:

 			TextClr = SendDlgItemMessage(hwndDlg, IDC_TXTCOLOR, CPM_GETCOLOUR, 0, 0);

-			db_set_dw(NULL, MODULENAME, TXT_COLOR_KEY, TextClr);

+			g_plugin.setDword(TXT_COLOR_KEY, TextClr);

 			if (HIWORD(wParam) == CPN_COLOURCHANGED) {

 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 				TxtclrLoop();

@@ -1155,7 +1155,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 

 		case IDC_BGCOLOR:

 			BackgoundClr = SendDlgItemMessage(hwndDlg, IDC_BGCOLOR, CPM_GETCOLOUR, 0, 0);

-			db_set_dw(NULL, MODULENAME, BG_COLOR_KEY, BackgoundClr);

+			g_plugin.setDword(BG_COLOR_KEY, BackgoundClr);

 			if (HIWORD(wParam) == CPN_COLOURCHANGED) {

 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 				BGclrLoop();

@@ -1213,46 +1213,46 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 	case WM_NOTIFY:

 		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			db_set_b(NULL, MODULENAME, MENU_OFF, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEMENU));

-			db_set_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SUPPRESS));

-			db_set_b(NULL, MODULENAME, UPDATE_ONSTART_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPDATE_ONSTART));

-			db_set_b(NULL, MODULENAME, UPDATE_ON_OPEN_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPDATE_ON_OPEN));

-			db_set_b(NULL, MODULENAME, HIDE_STATUS_ICON_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDE_STATUS_ICON));

-			db_set_b(NULL, MODULENAME, FONT_BOLD_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FONT_BOLD));

-			db_set_b(NULL, MODULENAME, FONT_ITALIC_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FONT_ITALIC));

-			db_set_b(NULL, MODULENAME, FONT_UNDERLINE_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FONT_UNDERLINE));

-			db_set_b(NULL, MODULENAME, UPDATE_ONALERT_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPDATE_ONALERT));

-			db_set_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SAVE_INDIVID_POS));

-			db_set_b(NULL, MODULENAME, NO_PROTECT_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_NO_PROTECT));

-			db_set_b(NULL, MODULENAME, DATA_POPUP_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DATAPOPUP));

+			g_plugin.setByte(MENU_OFF, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEMENU));

+			g_plugin.setByte(SUPPRESS_ERR_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SUPPRESS));

+			g_plugin.setByte(UPDATE_ONSTART_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPDATE_ONSTART));

+			g_plugin.setByte(UPDATE_ON_OPEN_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPDATE_ON_OPEN));

+			g_plugin.setByte(HIDE_STATUS_ICON_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDE_STATUS_ICON));

+			g_plugin.setByte(FONT_BOLD_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FONT_BOLD));

+			g_plugin.setByte(FONT_ITALIC_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FONT_ITALIC));

+			g_plugin.setByte(FONT_UNDERLINE_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FONT_UNDERLINE));

+			g_plugin.setByte(UPDATE_ONALERT_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPDATE_ONALERT));

+			g_plugin.setByte(SAVE_INDIVID_POS_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SAVE_INDIVID_POS));

+			g_plugin.setByte(NO_PROTECT_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_NO_PROTECT));

+			g_plugin.setByte(DATA_POPUP_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DATAPOPUP));

 

 			wchar_t str[100];

 			GetDlgItemText(hwndDlg, IDC_TYPEFACE, str, _countof(str));

-			db_set_ws(NULL, MODULENAME, FONT_FACE_KEY, str);

+			g_plugin.setWString(FONT_FACE_KEY, str);

 

-			db_set_b(NULL, MODULENAME, FONT_SIZE_KEY, (GetDlgItemInt(hwndDlg, IDC_FONTSIZE, nullptr, FALSE)));

-			db_set_b(NULL, MODULENAME, FONT_SCRIPT_KEY, ((BYTE)SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETCURSEL, 0, 0), 0)));

+			g_plugin.setByte(FONT_SIZE_KEY, (GetDlgItemInt(hwndDlg, IDC_FONTSIZE, nullptr, FALSE)));

+			g_plugin.setByte(FONT_SCRIPT_KEY, ((BYTE)SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_SCRIPT, CB_GETCURSEL, 0, 0), 0)));

 

-			db_set_b(NULL, MODULENAME, ERROR_POPUP_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ERROR_POPUP));

+			g_plugin.setByte(ERROR_POPUP_KEY, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ERROR_POPUP));

 

 			timerval = GetDlgItemInt(hwndDlg, IDC_TIME, nullptr, FALSE);

-			db_set_dw(NULL, MODULENAME, REFRESH_KEY, timerval);

-			db_set_dw(NULL, MODULENAME, COUNTDOWN_KEY, timerval);

+			g_plugin.setDword(REFRESH_KEY, timerval);

+			g_plugin.setDword(COUNTDOWN_KEY, timerval);

 

 

 			delaytime = GetDlgItemInt(hwndDlg, IDC_START_DELAY, nullptr, FALSE);

-			db_set_dw(NULL, MODULENAME, START_DELAY_KEY, delaytime);

+			g_plugin.setDword(START_DELAY_KEY, delaytime);

 

 			BackgoundClr = (SendDlgItemMessage(hwndDlg, IDC_BGCOLOR, CPM_GETCOLOUR, 0, 0));

 			TextClr = (SendDlgItemMessage(hwndDlg, IDC_TXTCOLOR, CPM_GETCOLOUR, 0, 0));

 

-			if ((db_get_dw(NULL, MODULENAME, REFRESH_KEY, 0) != 0)) {

+			if ((g_plugin.getDword(REFRESH_KEY, 0) != 0)) {

 				KillTimer(nullptr, timerId);

 				KillTimer(nullptr, Countdown);

-				timerId = SetTimer(nullptr, 0, ((db_get_dw(NULL, MODULENAME, REFRESH_KEY, 0)) * MINUTE), timerfunc);

+				timerId = SetTimer(nullptr, 0, ((g_plugin.getDword(REFRESH_KEY, 0)) * MINUTE), timerfunc);

 				Countdown = SetTimer(nullptr, 0, MINUTE, Countdownfunc);

 			}

-			if ((db_get_dw(NULL, MODULENAME, REFRESH_KEY, 0) == 0)) {

+			if ((g_plugin.getDword(REFRESH_KEY, 0) == 0)) {

 				KillTimer(nullptr, timerId);

 				KillTimer(nullptr, Countdown);

 			}

diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp
index 229583a1e8..96d416ad40 100644
--- a/plugins/WebView/src/webview_services.cpp
+++ b/plugins/WebView/src/webview_services.cpp
@@ -202,7 +202,7 @@ INT_PTR GetCaps(WPARAM wParam, LPARAM)
 	case PFLAGNUM_1:
 		return PF1_BASICSEARCH | PF1_ADDSEARCHRES | PF1_VISLIST;
 	case PFLAGNUM_2:
-		return db_get_b(NULL, MODULENAME, HIDE_STATUS_ICON_KEY, 0) ? 0 : (PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND); 
+		return g_plugin.getByte(HIDE_STATUS_ICON_KEY, 0) ? 0 : (PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND); 
 	case PFLAGNUM_3:
 		return 0;
 	case PFLAGNUM_4:
@@ -247,14 +247,14 @@ INT_PTR SetStatus(WPARAM wParam, LPARAM)
 	ProtoBroadcastAck(MODULENAME, NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE) oldStatus, wParam);
 
 	// Make sure no contact has offline status for any reason on first time run     
-	if ( db_get_b(NULL, MODULENAME, "FirstTime", 100) == 100) {
+	if ( g_plugin.getByte("FirstTime", 100) == 100) {
 		for (auto &hContact : Contacts(MODULENAME))
 			db_set_w(hContact, MODULENAME, "Status", ID_STATUS_ONLINE);
 
-		db_set_b(NULL, MODULENAME, "FirstTime", 1);
+		g_plugin.setByte("FirstTime", 1);
 	}
 
-	db_set_b(NULL, MODULENAME, OFFLINE_STATUS, bpStatus == ID_STATUS_OFFLINE);
+	g_plugin.setByte(OFFLINE_STATUS, bpStatus == ID_STATUS_OFFLINE);
 	return 0;
 }