db_* functions replaced with g_plugin calls

3 files changed, 11 insertions, 11 deletions

diff --git a/protocols/Tox/src/tox_bootstrap.cpp b/protocols/Tox/src/tox_bootstrap.cpp
index db4107a776..103f9a5fcf 100644
--- a/protocols/Tox/src/tox_bootstrap.cpp
+++ b/protocols/Tox/src/tox_bootstrap.cpp
@@ -26,7 +26,7 @@ void CToxProto::BootstrapNodesFromDb(Tox *tox, bool isIPv6)
 {
 	char module[MAX_PATH];
 	mir_snprintf(module, "%s_Nodes", m_szModuleName);
-	int nodeCount = db_get_w(NULL, module, TOX_SETTINGS_NODE_COUNT, 0);
+	int nodeCount = db_get_w(0, module, TOX_SETTINGS_NODE_COUNT, 0);
 	if (nodeCount == 0)
 		return;
 
@@ -35,7 +35,7 @@ void CToxProto::BootstrapNodesFromDb(Tox *tox, bool isIPv6)
 		mir_snprintf(setting, TOX_SETTINGS_NODE_IPV4, i);
 		ptrA address(db_get_sa(NULL, module, setting));
 		mir_snprintf(setting, TOX_SETTINGS_NODE_PORT, i);
-		int port = db_get_w(NULL, module, setting, 33445);
+		int port = db_get_w(0, module, setting, 33445);
 		mir_snprintf(setting, TOX_SETTINGS_NODE_PKEY, i);
 		ptrA pubKey(db_get_sa(NULL, module, setting));
 		BootstrapUdpNode(tox, address, port, pubKey);
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index d3fb835dfb..cd3a8357cd 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -462,7 +462,7 @@ void CToxOptionsNodeList::ReloadNodeList()
 

 	char module[MAX_PATH], setting[MAX_PATH];

 	mir_snprintf(module, "%s_Nodes", m_proto->m_szModuleName);

-	int nodeCount = db_get_w(NULL, module, TOX_SETTINGS_NODE_COUNT, 0);

+	int nodeCount = db_get_w(0, module, TOX_SETTINGS_NODE_COUNT, 0);

 	for (int i = 0; i < nodeCount; i++) {

 		mir_snprintf(setting, TOX_SETTINGS_NODE_IPV4, i);

 		ptrW value(db_get_wsa(NULL, module, setting));

@@ -473,7 +473,7 @@ void CToxOptionsNodeList::ReloadNodeList()
 		m_nodes.SetItem(iItem, 1, value);

 

 		mir_snprintf(setting, TOX_SETTINGS_NODE_PORT, i);

-		int port = db_get_w(NULL, module, setting, 0);

+		int port = db_get_w(0, module, setting, 0);

 		if (port > 0) {

 			char portNum[10];

 			itoa(port, portNum, 10);

@@ -516,27 +516,27 @@ bool CToxOptionsNodeList::OnApply()
 		lvi.iSubItem = 0;

 		m_nodes.GetItem(&lvi);

 		mir_snprintf(setting, TOX_SETTINGS_NODE_IPV4, iItem);

-		db_set_s(NULL, module, setting, _T2A(lvi.pszText));

+		db_set_s(0, module, setting, _T2A(lvi.pszText));

 

 		lvi.iSubItem = 1;

 		m_nodes.GetItem(&lvi);

 		mir_snprintf(setting, TOX_SETTINGS_NODE_IPV6, iItem);

-		db_set_s(NULL, module, setting, _T2A(lvi.pszText));

+		db_set_s(0, module, setting, _T2A(lvi.pszText));

 

 		lvi.iSubItem = 2;

 		m_nodes.GetItem(&lvi);

 		mir_snprintf(setting, TOX_SETTINGS_NODE_PORT, iItem);

-		db_set_w(NULL, module, setting, _wtoi(lvi.pszText));

+		db_set_w(0, module, setting, _wtoi(lvi.pszText));

 

 		lvi.iSubItem = 3;

 		m_nodes.GetItem(&lvi);

 		mir_snprintf(setting, TOX_SETTINGS_NODE_PKEY, iItem);

-		db_set_s(NULL, module, setting, _T2A(lvi.pszText));

+		db_set_s(0, module, setting, _T2A(lvi.pszText));

 

 		iItem++;

 	}

 	itemCount = iItem;

-	int nodeCount = db_get_b(NULL, module, TOX_SETTINGS_NODE_COUNT, 0);

+	int nodeCount = db_get_b(0, module, TOX_SETTINGS_NODE_COUNT, 0);

 	for (iItem = itemCount; iItem < nodeCount; iItem++) {

 		mir_snprintf(setting, TOX_SETTINGS_NODE_IPV4, iItem);

 		db_unset(NULL, module, setting);

@@ -547,7 +547,7 @@ bool CToxOptionsNodeList::OnApply()
 		mir_snprintf(setting, TOX_SETTINGS_NODE_PKEY, iItem);

 		db_unset(NULL, module, setting);

 	}

-	db_set_b(NULL, module, TOX_SETTINGS_NODE_COUNT, itemCount);

+	db_set_b(0, module, TOX_SETTINGS_NODE_COUNT, itemCount);

 	return true;

 }

 

diff --git a/protocols/Tox/src/tox_utils.cpp b/protocols/Tox/src/tox_utils.cpp
index 231a2b2106..8e80c3bda9 100644
--- a/protocols/Tox/src/tox_utils.cpp
+++ b/protocols/Tox/src/tox_utils.cpp
@@ -104,7 +104,7 @@ void CToxProto::ShowNotification(const wchar_t *caption, const wchar_t *message,
 		return;

 	}

 

-	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(0, "Popup", "ModuleIsEnabled", 1)) {

 		POPUPDATAT ppd = { 0 };

 		ppd.lchContact = hContact;

 		wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME);