db_* functions replaced with g_plugin calls

9 files changed, 25 insertions, 25 deletions

diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp
index 9634eba955..a2cfa5a2e5 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.cpp
+++ b/plugins/CloudFile/src/Services/dropbox_service.cpp
@@ -103,7 +103,7 @@ void CDropboxService::RequestAccessTokenThread(void *param)
 	}
 
 	node = root.at("access_token");
-	db_set_s(NULL, GetAccountName(), "TokenSecret", node.as_string().c_str());
+	db_set_s(0, GetAccountName(), "TokenSecret", node.as_string().c_str());
 
 	SetDlgItemTextA(hwndDlg, IDC_OAUTH_CODE, "");
 
@@ -133,7 +133,7 @@ void CDropboxService::HandleJsonError(JSONNode &node)
 auto CDropboxService::UploadFile(const char *data, size_t size, const std::string &path)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE);
 	DropboxAPI::UploadFileRequest request(token, path.c_str(), data, size, (OnConflict)strategy);
 	NLHR_PTR response(request.Send(m_hConnection));
 
@@ -162,7 +162,7 @@ void CDropboxService::UploadFileChunk(const std::string &sessionId, const char *
 auto CDropboxService::CommitUploadSession(const std::string &sessionId, const char *data, size_t size, size_t offset, const std::string &path)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE);
 	DropboxAPI::CommitUploadSessionRequest request(token, sessionId.c_str(), offset, path.c_str(), data, size, (OnConflict)strategy);
 	NLHR_PTR response(request.Send(m_hConnection));
 
diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp
index 9679c17fc0..313aa5efa7 100644
--- a/plugins/CloudFile/src/Services/google_service.cpp
+++ b/plugins/CloudFile/src/Services/google_service.cpp
@@ -128,14 +128,14 @@ void CGDriveService::RequestAccessTokenThread(void *param)
 	}
 
 	node = root.at("access_token");
-	db_set_s(NULL, GetAccountName(), "TokenSecret", node.as_string().c_str());
+	db_set_s(0, GetAccountName(), "TokenSecret", node.as_string().c_str());
 
 	node = root.at("expires_in");
 	time_t expiresIn = time(0) + node.as_int();
-	db_set_dw(NULL, GetAccountName(), "ExpiresIn", expiresIn);
+	db_set_dw(0, GetAccountName(), "ExpiresIn", expiresIn);
 
 	node = root.at("refresh_token");
-	db_set_s(NULL, GetAccountName(), "RefreshToken", node.as_string().c_str());
+	db_set_s(0, GetAccountName(), "RefreshToken", node.as_string().c_str());
 
 	SetDlgItemTextA(hwndDlg, IDC_OAUTH_CODE, "");
 
diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp
index c435bc19b4..992312e2a8 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.cpp
+++ b/plugins/CloudFile/src/Services/microsoft_service.cpp
@@ -65,7 +65,7 @@ void COneDriveService::Login(HWND owner)
 		JSONNode root = GetJsonResponse(response);
 
 		JSONNode node = root.at("access_token");
-		db_set_s(NULL, GetAccountName(), "TokenSecret", node.as_string().c_str());
+		db_set_s(0, GetAccountName(), "TokenSecret", node.as_string().c_str());
 
 		node = root.at("expires_in");
 		time_t expiresIn = time(0) + node.as_int();
@@ -154,7 +154,7 @@ void COneDriveService::HandleJsonError(JSONNode &node)
 auto COneDriveService::UploadFile(const std::string &parentId, const std::string &fileName, const char *data, size_t size)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE);
 	OneDriveAPI::UploadFileRequest *request = !parentId.empty()
 		? new OneDriveAPI::UploadFileRequest(token, parentId.c_str(), fileName.c_str(), data, size, (OnConflict)strategy)
 		: new OneDriveAPI::UploadFileRequest(token, fileName.c_str(), data, size, (OnConflict)strategy);
@@ -168,7 +168,7 @@ auto COneDriveService::UploadFile(const std::string &parentId, const std::string
 auto COneDriveService::CreateUploadSession(const std::string &parentId, const std::string &fileName)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE);
 	OneDriveAPI::CreateUploadSessionRequest *request = !parentId.empty()
 		? new OneDriveAPI::CreateUploadSessionRequest(token, parentId.c_str(), fileName.c_str(), (OnConflict)strategy)
 		: new OneDriveAPI::CreateUploadSessionRequest(token, fileName.c_str(), (OnConflict)strategy);
diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp
index ca8ba197d6..a1472ee197 100644
--- a/plugins/CloudFile/src/Services/yandex_service.cpp
+++ b/plugins/CloudFile/src/Services/yandex_service.cpp
@@ -167,7 +167,7 @@ void CYandexService::HandleJsonError(JSONNode &node)
 auto CYandexService::CreateUploadSession(const std::string &path)
 {
 	ptrA token(getStringA("TokenSecret"));
-	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE);
 	YandexAPI::GetUploadUrlRequest request(token, path.c_str(), (OnConflict)strategy);
 	NLHR_PTR response(request.Send(m_hConnection));
 
diff --git a/plugins/CloudFile/src/menus.cpp b/plugins/CloudFile/src/menus.cpp
index 7a5ddb084d..3ca1b085b9 100644
--- a/plugins/CloudFile/src/menus.cpp
+++ b/plugins/CloudFile/src/menus.cpp
@@ -15,7 +15,7 @@ void InitializeMenus()
 	SET_UID(mi, 0x93d4495b, 0x259b, 0x4fba, 0xbc, 0x14, 0xf9, 0x46, 0x2c, 0xda, 0xfc, 0x6d);
 	mi.name.a = LPGEN("Upload to...");
 
-	ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService"));
+	ptrA defaultService(g_plugin.getStringA("DefaultService"));
 	if (defaultService) {
 		CCloudService *service = FindService(defaultService);
 		if (service) {
diff --git a/plugins/CloudFile/src/options.cpp b/plugins/CloudFile/src/options.cpp
index c17ef8d9d2..0ac7c120a0 100644
--- a/plugins/CloudFile/src/options.cpp
+++ b/plugins/CloudFile/src/options.cpp
@@ -21,7 +21,7 @@ bool COptionsMainDlg::OnInitDialog()
 {
 	CDlgBase::OnInitDialog();
 
-	ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService"));
+	ptrA defaultService(g_plugin.getStringA("DefaultService"));
 	int iItem = m_defaultService.AddString(TranslateT("None"));
 	m_defaultService.SetCurSel(iItem);
 
@@ -31,7 +31,7 @@ bool COptionsMainDlg::OnInitDialog()
 			m_defaultService.SetCurSel(iItem);
 	}
 
-	BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+	BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE);
 	switch (strategy)
 	{
 	case OnConflict::RENAME:
@@ -58,16 +58,16 @@ bool COptionsMainDlg::OnApply()
 	int iItem = m_defaultService.GetCurSel();
 	CCloudService *service = (CCloudService*)m_defaultService.GetItemData(iItem);
 	if (service)
-		db_set_s(NULL, MODULENAME, "DefaultService", service->GetAccountName());
+		g_plugin.setString("DefaultService", service->GetAccountName());
 	else
-		db_unset(NULL, MODULENAME, "DefaultService");
+		g_plugin.delSetting("DefaultService");
 
 	if (m_renameOnConflict.GetState())
-		db_set_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::RENAME);
+		g_plugin.setByte("ConflictStrategy", OnConflict::RENAME);
 	else if (m_repalceOnConflict.GetState())
-		db_set_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE);
+		g_plugin.setByte("ConflictStrategy", OnConflict::REPLACE);
 	else
-		db_unset(NULL, MODULENAME, "ConflictStrategy");
+		g_plugin.delSetting("ConflictStrategy");
 	return true;
 }
 
diff --git a/plugins/CloudFile/src/services.cpp b/plugins/CloudFile/src/services.cpp
index 9f1867cb6e..e0a01fbfba 100644
--- a/plugins/CloudFile/src/services.cpp
+++ b/plugins/CloudFile/src/services.cpp
@@ -24,7 +24,7 @@ static INT_PTR GetService(WPARAM wParam, LPARAM lParam)
 
 	ptrA accountName(mir_strdup((char*)wParam));
 	if (!accountName || !mir_strlen(accountName))
-		accountName = db_get_sa(NULL, MODULENAME, "DefaultService");
+		accountName = g_plugin.getStringA("DefaultService");
 	if (accountName == nullptr)
 		return 2;
 
@@ -63,7 +63,7 @@ INT_PTR Upload(WPARAM wParam, LPARAM lParam)
 
 	ptrA accountName(mir_strdup(uploadData->accountName));
 	if (!mir_strlen(accountName))
-		accountName = db_get_sa(NULL, MODULENAME, "DefaultService");
+		accountName = g_plugin.getStringA("DefaultService");
 	if (accountName == nullptr)
 		return 2;
 
diff --git a/plugins/CloudFile/src/srmm.cpp b/plugins/CloudFile/src/srmm.cpp
index ae12de3bf1..b4d44c9fdd 100644
--- a/plugins/CloudFile/src/srmm.cpp
+++ b/plugins/CloudFile/src/srmm.cpp
@@ -42,7 +42,7 @@ int OnSrmmButtonPressed(WPARAM, LPARAM lParam)
 		return 0;
 
 	if (cbc->flags != BBCF_ARROWCLICKED) {
-		ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService"));
+		ptrA defaultService(g_plugin.getStringA("DefaultService"));
 		if (defaultService) {
 			CCloudService *service = FindService(defaultService);
 			if (service)
diff --git a/plugins/CloudFile/src/utils.cpp b/plugins/CloudFile/src/utils.cpp
index 22611fe539..5d75225db8 100644
--- a/plugins/CloudFile/src/utils.cpp
+++ b/plugins/CloudFile/src/utils.cpp
@@ -5,7 +5,7 @@ void ShowNotification(const wchar_t *caption, const wchar_t *message, int flags,
 	if (Miranda_IsTerminated())
 		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);
@@ -102,12 +102,12 @@ void PasteToClipboard(const wchar_t *data)
 
 void Report(MCONTACT hContact, const wchar_t *data)
 {
-	if (db_get_b(NULL, MODULENAME, "UrlAutoSend", 1))
+	if (g_plugin.getByte("UrlAutoSend", 1))
 		SendToContact(hContact, data);
 
-	if (db_get_b(NULL, MODULENAME, "UrlPasteToMessageInputArea", 0))
+	if (g_plugin.getByte("UrlPasteToMessageInputArea", 0))
 		PasteToInputArea(hContact, data);
 
-	if (db_get_b(NULL, MODULENAME, "UrlCopyToClipboard", 0))
+	if (g_plugin.getByte("UrlCopyToClipboard", 0))
 		PasteToClipboard(data);
 }