db_* functions replaced with g_plugin calls

2 files changed, 41 insertions, 41 deletions

diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index 79cad93fdc..15c18f7e28 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -22,54 +22,54 @@ INT_PTR APIChangeTextLayout(WPARAM wParam, LPARAM lParam)
 

 void ReadMainOptions()

 {

-	moOptions.dwHotkey_Layout = db_get_dw(NULL, MODULENAME, "HotkeyLayout", 119);

-	moOptions.dwHotkey_Layout2 = db_get_dw(NULL, MODULENAME, "HotkeyLayout2", 120);

-	moOptions.dwHotkey_Case = db_get_dw(NULL, MODULENAME, "HotkeyCase", 121);

-	moOptions.CurrentWordLayout = db_get_b(NULL, MODULENAME, "CurrentWordLayout", 0);

-	moOptions.CurrentWordLayout2 = db_get_b(NULL, MODULENAME, "CurrentWordLayout2", 1);

-	moOptions.CurrentWordCase = db_get_b(NULL, MODULENAME, "CurrentWordCase", 0);

-	moOptions.TwoWay = db_get_b(NULL, MODULENAME, "TwoWay", 1);

-	moOptions.ChangeSystemLayout = db_get_b(NULL, MODULENAME, "ChangeSystemLayout", 1);

-	moOptions.CopyToClipboard = db_get_b(NULL, MODULENAME, "CopyToClipboard", 0);

-	moOptions.ShowPopup = db_get_b(NULL, MODULENAME, "ShowPopup", 1);

-	moOptions.bCaseOperations = db_get_b(NULL, MODULENAME, "CaseOperations", 0);

+	moOptions.dwHotkey_Layout = g_plugin.getDword("HotkeyLayout", 119);

+	moOptions.dwHotkey_Layout2 = g_plugin.getDword("HotkeyLayout2", 120);

+	moOptions.dwHotkey_Case = g_plugin.getDword("HotkeyCase", 121);

+	moOptions.CurrentWordLayout = g_plugin.getByte("CurrentWordLayout", 0);

+	moOptions.CurrentWordLayout2 = g_plugin.getByte("CurrentWordLayout2", 1);

+	moOptions.CurrentWordCase = g_plugin.getByte("CurrentWordCase", 0);

+	moOptions.TwoWay = g_plugin.getByte("TwoWay", 1);

+	moOptions.ChangeSystemLayout = g_plugin.getByte("ChangeSystemLayout", 1);

+	moOptions.CopyToClipboard = g_plugin.getByte("CopyToClipboard", 0);

+	moOptions.ShowPopup = g_plugin.getByte("ShowPopup", 1);

+	moOptions.bCaseOperations = g_plugin.getByte("CaseOperations", 0);

 }

 

 void WriteMainOptions()

 {

-	db_set_dw(NULL, MODULENAME, "HotkeyLayout", moOptions.dwHotkey_Layout);

-	db_set_dw(NULL, MODULENAME, "HotkeyLayout2", moOptions.dwHotkey_Layout2);

-	db_set_dw(NULL, MODULENAME, "HotkeyCase", moOptions.dwHotkey_Case);

-	db_set_b(NULL, MODULENAME, "CurrentWordLayout", moOptions.CurrentWordLayout);

-	db_set_b(NULL, MODULENAME, "CurrentWordLayout2", moOptions.CurrentWordLayout2);

-	db_set_b(NULL, MODULENAME, "CurrentWordCase", moOptions.CurrentWordCase);

-	db_set_b(NULL, MODULENAME, "TwoWay", moOptions.TwoWay);

-	db_set_b(NULL, MODULENAME, "ChangeSystemLayout", moOptions.ChangeSystemLayout);

-	db_set_b(NULL, MODULENAME, "CopyToClipboard", moOptions.CopyToClipboard);

-	db_set_b(NULL, MODULENAME, "ShowPopup", moOptions.ShowPopup);

-	db_set_b(NULL, MODULENAME, "CaseOperations", moOptions.bCaseOperations);

+	g_plugin.setDword("HotkeyLayout", moOptions.dwHotkey_Layout);

+	g_plugin.setDword("HotkeyLayout2", moOptions.dwHotkey_Layout2);

+	g_plugin.setDword("HotkeyCase", moOptions.dwHotkey_Case);

+	g_plugin.setByte("CurrentWordLayout", moOptions.CurrentWordLayout);

+	g_plugin.setByte("CurrentWordLayout2", moOptions.CurrentWordLayout2);

+	g_plugin.setByte("CurrentWordCase", moOptions.CurrentWordCase);

+	g_plugin.setByte("TwoWay", moOptions.TwoWay);

+	g_plugin.setByte("ChangeSystemLayout", moOptions.ChangeSystemLayout);

+	g_plugin.setByte("CopyToClipboard", moOptions.CopyToClipboard);

+	g_plugin.setByte("ShowPopup", moOptions.ShowPopup);

+	g_plugin.setByte("CaseOperations", moOptions.bCaseOperations);

 }

 

 void ReadPopupOptions()

 {

-	poOptions.bColourType = db_get_b(NULL, MODULENAME, "ColourType", 0);

-	poOptions.crBackColour = (COLORREF)db_get_dw(NULL, MODULENAME, "BackColor", 0xD2CABF);

-	poOptions.crTextColour = (COLORREF)db_get_dw(NULL, MODULENAME, "TextColor", 0x000000);

-	poOptions.bTimeoutType = db_get_b(NULL, MODULENAME, "TimeoutType", 0);

-	poOptions.bTimeout = db_get_b(NULL, MODULENAME, "Timeout", 10);

-	poOptions.bLeftClick = db_get_b(NULL, MODULENAME, "LeftClick", 0);

-	poOptions.bRightClick = db_get_b(NULL, MODULENAME, "RightClick", 1);

+	poOptions.bColourType = g_plugin.getByte("ColourType", 0);

+	poOptions.crBackColour = (COLORREF)g_plugin.getDword("BackColor", 0xD2CABF);

+	poOptions.crTextColour = (COLORREF)g_plugin.getDword("TextColor", 0x000000);

+	poOptions.bTimeoutType = g_plugin.getByte("TimeoutType", 0);

+	poOptions.bTimeout = g_plugin.getByte("Timeout", 10);

+	poOptions.bLeftClick = g_plugin.getByte("LeftClick", 0);

+	poOptions.bRightClick = g_plugin.getByte("RightClick", 1);

 }

 

 void WritePopupOptions()

 {

-	db_set_b(NULL, MODULENAME, "ColourType", poOptions.bColourType);

-	db_set_dw(NULL, MODULENAME, "BackColor", poOptions.crBackColour);

-	db_set_dw(NULL, MODULENAME, "TextColor", poOptions.crTextColour);

-	db_set_b(NULL, MODULENAME, "TimeoutType", poOptions.bTimeoutType);

-	db_set_b(NULL, MODULENAME, "Timeout", poOptions.bTimeout);

-	db_set_b(NULL, MODULENAME, "LeftClick", poOptions.bLeftClick);

-	db_set_b(NULL, MODULENAME, "RightClick", poOptions.bRightClick);

+	g_plugin.setByte("ColourType", poOptions.bColourType);

+	g_plugin.setDword("BackColor", poOptions.crBackColour);

+	g_plugin.setDword("TextColor", poOptions.crTextColour);

+	g_plugin.setByte("TimeoutType", poOptions.bTimeoutType);

+	g_plugin.setByte("Timeout", poOptions.bTimeout);

+	g_plugin.setByte("LeftClick", poOptions.bLeftClick);

+	g_plugin.setByte("RightClick", poOptions.bRightClick);

 }

 

 void RegPopupActions()

@@ -101,7 +101,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 	for (int i = 0; i < bLayNum; i++) {

 		LPTSTR ptszCurrLayout = GenerateLayoutString(hklLayouts[i]);

 		LPSTR ptszTemp = GetNameOfLayout(hklLayouts[i]);

-		ptrW tszValue(db_get_wsa(NULL, MODULENAME, ptszTemp));

+		ptrW tszValue(g_plugin.getWStringA(ptszTemp));

 		if (tszValue == 0)

 			ptszLayStrings[i] = ptszCurrLayout;

 		else if (!mir_wstrcmp(tszValue, ptszEmptySting))

@@ -109,7 +109,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 		else {

 			ptszLayStrings[i] = tszValue.detach();

 			if (!mir_wstrcmp(ptszCurrLayout, ptszLayStrings[i]))

-				db_unset(NULL, MODULENAME, ptszTemp);

+				g_plugin.delSetting(ptszTemp);

 			mir_free(ptszCurrLayout);

 		}

 		mir_free(ptszTemp);

@@ -134,7 +134,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 

 	RegPopupActions();

 

-	db_set_dw(NULL, MODULENAME, "CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM));

+	g_plugin.setDword("CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM));

 	return 0;

 }

 

diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp
index d70b37048e..a27d12566f 100644
--- a/plugins/ChangeKeyboardLayout/src/options.cpp
+++ b/plugins/ChangeKeyboardLayout/src/options.cpp
@@ -211,9 +211,9 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP
 					pszNameLay = GetNameOfLayout(hklLayouts[i]);

 

 					if (mir_wstrcmp(ptszMemLay, ptszGenLay) != 0)

-						db_set_ws(NULL, MODULENAME, pszNameLay, ptszMemLay);

+						g_plugin.setWString(pszNameLay, ptszMemLay);

 					else

-						db_unset(NULL, MODULENAME, pszNameLay);

+						g_plugin.delSetting(pszNameLay);

 

 					mir_free(pszNameLay);

 					mir_free(ptszGenLay);