db_* functions replaced with g_plugin calls

6 files changed, 48 insertions, 48 deletions

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index e6daa9821e..66050a51b1 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -491,7 +491,7 @@ INT_PTR srvVariablesHandler(WPARAM, LPARAM lParam)
 	}

 	else if (!mir_wstrcmp(ai->argv.w[0], VAR_MYNICK)) {

 		if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_MYNICKPERPROTO) && VarParseData.szProto)

-			Result = db_get_s(NULL, VarParseData.szProto, "Nick", (wchar_t*)nullptr);

+			Result = db_get_s(0, VarParseData.szProto, "Nick", (wchar_t*)nullptr);

 

 		if (Result == nullptr)

 			Result = Clist_GetContactDisplayName(0);

@@ -710,18 +710,18 @@ int CMPlugin::Load()
 	InitCommonControls();

 	InitOptions(); // must be called before we hook CallService

 

-	if (db_get_b(NULL, MODULENAME, DB_SETTINGSVER, 0) < 1) { // change all %nas_message% variables to %extratext% if it wasn't done before

-		TCString Str = db_get_s(NULL, MODULENAME, "PopupsFormat", L"");

+	if (g_plugin.getByte(DB_SETTINGSVER, 0) < 1) { // change all %nas_message% variables to %extratext% if it wasn't done before

+		TCString Str = db_get_s(0, MODULENAME, "PopupsFormat", L"");

 		if (Str.GetLen())

-			db_set_ws(NULL, MODULENAME, "PopupsFormat", Str.Replace(L"nas_message", L"extratext"));

+			g_plugin.setWString("PopupsFormat", Str.Replace(L"nas_message", L"extratext"));

 

-		Str = db_get_s(NULL, MODULENAME, "ReplyPrefix", L"");

+		Str = db_get_s(0, MODULENAME, "ReplyPrefix", L"");

 		if (Str.GetLen())

-			db_set_ws(NULL, MODULENAME, "ReplyPrefix", Str.Replace(L"nas_message", L"extratext"));

+			g_plugin.setWString("ReplyPrefix", Str.Replace(L"nas_message", L"extratext"));

 	}

-	if (db_get_b(NULL, MODULENAME, DB_SETTINGSVER, 0) < 2) { // disable autoreply for not-on-list contacts, as such contact may be a spam bot

-		db_set_b(NULL, MODULENAME, ContactStatusToDBSetting(0, DB_ENABLEREPLY, 0, INVALID_CONTACT_ID), 0);

-		db_set_b(NULL, MODULENAME, DB_SETTINGSVER, 2);

+	if (g_plugin.getByte(DB_SETTINGSVER, 0) < 2) { // disable autoreply for not-on-list contacts, as such contact may be a spam bot

+		g_plugin.setByte(ContactStatusToDBSetting(0, DB_ENABLEREPLY, 0, INVALID_CONTACT_ID), 0);

+		g_plugin.setByte(DB_SETTINGSVER, 2);

 	}

 	return 0;

 }

diff --git a/plugins/NewAwaySysMod/src/Client.cpp b/plugins/NewAwaySysMod/src/Client.cpp
index ab4d62c937..dbabd5a025 100644
--- a/plugins/NewAwaySysMod/src/Client.cpp
+++ b/plugins/NewAwaySysMod/src/Client.cpp
@@ -88,7 +88,7 @@ void ChangeProtoMessages(char* szProto, int iMode, const TCString &Msg)
 	}

 	else { // change message of all protocols

 		for (auto &pa : Accounts()) {

-			if (!db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0)) {

+			if (!db_get_b(0, pa->szModuleName, "LockMainStatus", 0)) {

 				if (Msg == nullptr)

 					CurMsg = GetDynamicStatMsg(INVALID_CONTACT_ID, pa->szModuleName);

 

@@ -119,8 +119,8 @@ void ChangeProtoMessages(char* szProto, int iMode, const TCString &Msg)
 

 	for (int i = 0; i < _countof(StatusDbSettings); i++) {

 		if (iMode == StatusDbSettings[i].Status) {

-			db_set_ws(NULL, "SRAway", CString(StatusDbSettings[i].Setting) + "Msg", CurMsg);

-			db_set_ws(NULL, "SRAway", CString(StatusDbSettings[i].Setting) + "Default", CurMsg); // TODO: make it more accurate, and change not only here, but when changing status messages through UpdateMsgsTimerFunc too; and when changing messages through AutoAway() ?

+			db_set_ws(0, "SRAway", CString(StatusDbSettings[i].Setting) + "Msg", CurMsg);

+			db_set_ws(0, "SRAway", CString(StatusDbSettings[i].Setting) + "Default", CurMsg); // TODO: make it more accurate, and change not only here, but when changing status messages through UpdateMsgsTimerFunc too; and when changing messages through AutoAway() ?

 			break;

 		}

 	}

diff --git a/plugins/NewAwaySysMod/src/Options.cpp b/plugins/NewAwaySysMod/src/Options.cpp
index 93bd19c804..27015af169 100644
--- a/plugins/NewAwaySysMod/src/Options.cpp
+++ b/plugins/NewAwaySysMod/src/Options.cpp
@@ -143,7 +143,7 @@ TCString COptItem::GetStrDBVal(const CString &sModule, CString *sDBSettingPrefix
 {

 	if (sDBSetting != nullptr) {

 		_ASSERT(GetDefValue());

-		return db_get_s(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, *(TCString*)GetDefValue());

+		return db_get_s(0, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, *(TCString*)GetDefValue());

 	}

 	return *(TCString*)GetDefValue();

 }

@@ -151,7 +151,7 @@ TCString COptItem::GetStrDBVal(const CString &sModule, CString *sDBSettingPrefix
 void COptItem::SetStrDBVal(const CString &sModule, TCString &Str, CString *sDBSettingPrefix)

 {

 	if (sDBSetting != nullptr && !m_bReadOnly) {

-		db_set_ws(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str);

+		db_set_ws(0, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str);

 	}

 }

 

@@ -271,11 +271,11 @@ int TreeReadEnum(const char *szSetting, void *lParam)
 	int Len = pData->TreeCtrl->sDBSetting.GetLen() + _countof(TREEITEM_DBSTR_TITLE) - 1;

 	if (!strncmp(szSetting, pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_TITLE, Len) && isdigit(szSetting[Len])) {

 		int ID = atol(szSetting + Len);

-		short ParentID = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) ? 0 : db_get_w(NULL, pData->sModule,

+		short ParentID = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) ? 0 : db_get_w(0, pData->sModule,

 			pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_PARENT + (szSetting + Len), -1);

-		short Order = db_get_w(NULL, pData->sModule,

+		short Order = db_get_w(0, pData->sModule,

 			pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_ORDER + (szSetting + Len), -1);

-		char Flags = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL && !(pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)) ? 0 : db_get_b(NULL, pData->sModule,

+		char Flags = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL && !(pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)) ? 0 : db_get_b(0, pData->sModule,

 			pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_FLAGS + (szSetting + Len), 0);

 		if (ParentID >= 0 && Order >= 0) {

 			CString tmp(pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + pData->TreeCtrl->User_Str1_DBName + CString(szSetting + Len));

@@ -285,8 +285,8 @@ int TreeReadEnum(const char *szSetting, void *lParam)
 			pItem.ParentID = ParentID;

 			pItem.Flags = Flags;

 			pItem.hItem = nullptr;

-			pItem.Title = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, L"");

-			pItem.User_Str1 = (pData->TreeCtrl->User_Str1_DBName == nullptr) ? nullptr : db_get_s(NULL, pData->sModule, tmp, (wchar_t*)nullptr);

+			pItem.Title = db_get_s(0, pData->sModule, *pData->sDBSettingPrefix + szSetting, L"");

+			pItem.User_Str1 = (pData->TreeCtrl->User_Str1_DBName == nullptr) ? nullptr : db_get_s(0, pData->sModule, tmp, (wchar_t*)nullptr);

 		}

 	}

 	return 0;

@@ -326,16 +326,16 @@ void COptItem_TreeCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi
 			CString StrID;

 			_itoa(m_value[i].ID, StrID.GetBuffer(64), 10);

 			StrID.ReleaseBuffer();

-			db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, m_value[i].Title);

+			db_set_ws(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, m_value[i].Title);

 			if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL))

-				db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, m_value[i].ParentID);

+				db_set_w(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, m_value[i].ParentID);

 

-			db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_ORDER + StrID, i);

+			db_set_w(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_ORDER + StrID, i);

 			if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) || TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)

-				db_set_b(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, m_value[i].Flags);

+				db_set_b(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, m_value[i].Flags);

 

 			if (User_Str1_DBName != nullptr && m_value[i].User_Str1 != nullptr)

-				db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, m_value[i].User_Str1);

+				db_set_ws(0, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, m_value[i].User_Str1);

 		}

 		COptItem::MemToDB(sModule, sDBSettingPrefix);

 	}

@@ -650,7 +650,7 @@ int ListReadEnum(const char *szSetting, void *lParam)
 	int Len = pData->sDBSettingPrefix.GetLen() + pData->ListCtrl->sDBSetting.GetLen() + _countof(LISTITEM_DBSTR_TEXT) - 1;

 	if (!strncmp(szSetting, pData->sDBSettingPrefix + pData->ListCtrl->sDBSetting + LISTITEM_DBSTR_TEXT, Len) && isdigit(szSetting[Len])) {

 		int ID = atol(szSetting + Len);

-		pData->ListCtrl->m_value.SetAtGrow(ID).Text = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, L"");

+		pData->ListCtrl->m_value.SetAtGrow(ID).Text = db_get_s(0, pData->sModule, *pData->sDBSettingPrefix + szSetting, L"");

 	}

 	return 0;

 }

@@ -689,7 +689,7 @@ void COptItem_ListCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi
 			CString StrID;

 			_itoa(i, StrID.GetBuffer(64), 10);

 			StrID.ReleaseBuffer();

-			db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, m_value[i].Text);

+			db_set_ws(0, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, m_value[i].Text);

 		}

 		COptItem::MemToDB(sModule, sDBSettingPrefix);

 	}

diff --git a/plugins/NewAwaySysMod/src/Properties.cpp b/plugins/NewAwaySysMod/src/Properties.cpp
index 3c570cfe51..2d85ad477c 100644
--- a/plugins/NewAwaySysMod/src/Properties.cpp
+++ b/plugins/NewAwaySysMod/src/Properties.cpp
@@ -68,7 +68,7 @@ CProtoState::CStatus& CProtoState::CStatus::operator=(int Status)
 		int bStatusModified = false;

 		for (int i = 0; i < m_grandParent->GetSize(); i++) {

 			CProtoState &State = (*m_grandParent)[i];

-			if (!db_get_b(NULL, State.GetProto(), "LockMainStatus", 0)) { // if the protocol isn't locked

+			if (!db_get_b(0, State.GetProto(), "LockMainStatus", 0)) { // if the protocol isn't locked

 				if (State.m_status != Status) {

 					State.m_status.m_status = Status; // "Status.Status" - changing Status directly to prevent recursive calls to the function

 					State.m_awaySince.Reset();

@@ -164,12 +164,12 @@ void CProtoSettings::SetMsgFormat(int Flags, TCString Message)
 		g_ProtoStates[szProto].TempMsg.Unset();

 		CString DBSetting(ProtoStatusToDBSetting(DB_STATUSMSG, IDC_MOREOPTDLG_PERSTATUSPROTOMSGS));

 		if (Message != nullptr)

-			db_set_ws(NULL, MODULENAME, DBSetting, Message);

+			g_plugin.setWString(DBSetting, Message);

 		else {

 			if (!szProto)

-				db_set_ws(NULL, MODULENAME, DBSetting, CProtoSettings(nullptr, Status).GetMsgFormat(GMF_LASTORDEFAULT)); // global message can't be NULL; we can use an empty string instead if it's really necessary

+				g_plugin.setWString(DBSetting, CProtoSettings(nullptr, Status).GetMsgFormat(GMF_LASTORDEFAULT)); // global message can't be NULL; we can use an empty string instead if it's really necessary

 			else

-				db_unset(NULL, MODULENAME, DBSetting);

+				g_plugin.delSetting(DBSetting);

 		}

 	}

 

@@ -263,7 +263,7 @@ TCString CProtoSettings::GetMsgFormat(int Flags, int *pOrder)
 		}

 	}

 	if (Flags & GMF_PERSONAL && Message == nullptr) // try getting personal message (it overrides global)

-		Message = db_get_s(NULL, MODULENAME, ProtoStatusToDBSetting(DB_STATUSMSG, IDC_MOREOPTDLG_PERSTATUSPROTOMSGS), (wchar_t*)nullptr);

+		Message = db_get_s(0, MODULENAME, ProtoStatusToDBSetting(DB_STATUSMSG, IDC_MOREOPTDLG_PERSTATUSPROTOMSGS), (wchar_t*)nullptr);

 

 	if (Flags & GMF_PROTOORGLOBAL && Message == nullptr) {

 		Message = CProtoSettings().GetMsgFormat(GMF_PERSONAL | (Flags & GMF_TEMPORARY), pOrder);

@@ -276,7 +276,7 @@ TCString CProtoSettings::GetMsgFormat(int Flags, int *pOrder)
 		TreeCtrl->DBToMem(CString(MODULENAME));

 		Message = nullptr;

 		if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_USELASTMSG)) { // if using last message by default...

-			Message = db_get_s(NULL, MODULENAME, ProtoStatusToDBSetting(DB_STATUSMSG, IDC_MOREOPTDLG_PERSTATUSPROTOMSGS), (wchar_t*)nullptr); // try per-protocol message first

+			Message = db_get_s(0, MODULENAME, ProtoStatusToDBSetting(DB_STATUSMSG, IDC_MOREOPTDLG_PERSTATUSPROTOMSGS), (wchar_t*)nullptr); // try per-protocol message first

 			if (Message.IsEmpty()) {

 				Message = nullptr; // to be sure it's NULL, not "" - as we're checking 'Message == NULL' later

 				int RecentGroupID = GetRecentGroupID(Status);

diff --git a/plugins/NewAwaySysMod/src/Properties.h b/plugins/NewAwaySysMod/src/Properties.h
index 27da4917e4..fa1e083f7b 100644
--- a/plugins/NewAwaySysMod/src/Properties.h
+++ b/plugins/NewAwaySysMod/src/Properties.h
@@ -326,19 +326,19 @@ public:
 		CAutoreply& operator=(const int m_value)

 		{

 			CString Setting(Parent->szProto ? Parent->ProtoStatusToDBSetting(DB_ENABLEREPLY, IDC_MOREOPTDLG_PERSTATUSPROTOSETTINGS) : DB_ENABLEREPLY);

-			if (db_get_b(NULL, MODULENAME, Setting, VAL_USEDEFAULT) == m_value)

+			if (g_plugin.getByte(Setting, VAL_USEDEFAULT) == m_value)

 				return *this;

 

 			if (m_value != VAL_USEDEFAULT)

-				db_set_b(NULL, MODULENAME, Setting, m_value != 0);

+				g_plugin.setByte(Setting, m_value != 0);

 			else

-				db_unset(NULL, MODULENAME, Setting);

+				g_plugin.delSetting(Setting);

 			return *this;

 		}

 		

 		operator int()

 		{

-			return db_get_b(NULL, MODULENAME, Parent->szProto ? Parent->ProtoStatusToDBSetting(DB_ENABLEREPLY, IDC_MOREOPTDLG_PERSTATUSPROTOSETTINGS) : DB_ENABLEREPLY, 

+			return g_plugin.getByte(Parent->szProto ? Parent->ProtoStatusToDBSetting(DB_ENABLEREPLY, IDC_MOREOPTDLG_PERSTATUSPROTOSETTINGS) : DB_ENABLEREPLY, 

 				Parent->szProto ? VAL_USEDEFAULT : AUTOREPLY_DEF_REPLY);

 		}

 		

diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index acf2df40ab..5a6f29d5f6 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -520,12 +520,12 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			MinContactSplitterX = rcMsgDlg.right - rc.left + 1;

 

 			// [try] getting dialog position

-			int DlgPosX = db_get_dw(NULL, MODULENAME, SAM_DB_DLGPOSX, -1);

-			int DlgPosY = db_get_dw(NULL, MODULENAME, SAM_DB_DLGPOSY, -1);

-			int DlgSizeX = db_get_dw(NULL, MODULENAME, SAM_DB_DLGSIZEX, -1);

-			int DlgSizeY = db_get_dw(NULL, MODULENAME, SAM_DB_DLGSIZEY, -1);

-			int MsgSplitterX = db_get_dw(NULL, MODULENAME, SAM_DB_MSGSPLITTERPOS, -1);

-			int ContactSplitterX = db_get_dw(NULL, MODULENAME, SAM_DB_CONTACTSPLITTERPOS, -1);

+			int DlgPosX = g_plugin.getDword(SAM_DB_DLGPOSX, -1);

+			int DlgPosY = g_plugin.getDword(SAM_DB_DLGPOSY, -1);

+			int DlgSizeX = g_plugin.getDword(SAM_DB_DLGSIZEX, -1);

+			int DlgSizeY = g_plugin.getDword(SAM_DB_DLGSIZEY, -1);

+			int MsgSplitterX = g_plugin.getDword(SAM_DB_MSGSPLITTERPOS, -1);

+			int ContactSplitterX = g_plugin.getDword(SAM_DB_CONTACTSPLITTERPOS, -1);

 			if (DlgPosX >= 0 && DlgPosY >= 0 && DlgSizeX > 0 && DlgSizeY > 0 && MsgSplitterX > 0 && ContactSplitterX > 0) {

 				RECT rcWorkArea, rcIntersect;

 				SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0);

@@ -939,12 +939,12 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 		{

 			RECT rcRect;

 			GetWindowRect(hwndDlg, &rcRect);

-			db_set_dw(NULL, MODULENAME, SAM_DB_DLGPOSX, rcRect.left);

-			db_set_dw(NULL, MODULENAME, SAM_DB_DLGPOSY, rcRect.top);

-			db_set_dw(NULL, MODULENAME, SAM_DB_DLGSIZEX, rcRect.right - rcRect.left);

-			db_set_dw(NULL, MODULENAME, SAM_DB_DLGSIZEY, rcRect.bottom - rcRect.top);

-			db_set_dw(NULL, MODULENAME, SAM_DB_MSGSPLITTERPOS, g_MsgSplitterX);

-			db_set_dw(NULL, MODULENAME, SAM_DB_CONTACTSPLITTERPOS, g_ContactSplitterX);

+			g_plugin.setDword(SAM_DB_DLGPOSX, rcRect.left);

+			g_plugin.setDword(SAM_DB_DLGPOSY, rcRect.top);

+			g_plugin.setDword(SAM_DB_DLGSIZEX, rcRect.right - rcRect.left);

+			g_plugin.setDword(SAM_DB_DLGSIZEY, rcRect.bottom - rcRect.top);

+			g_plugin.setDword(SAM_DB_MSGSPLITTERPOS, g_MsgSplitterX);

+			g_plugin.setDword(SAM_DB_CONTACTSPLITTERPOS, g_ContactSplitterX);

 			g_SetAwayMsgPage.PageToMemToDB();

 		}

 		break;