From 53fe3e46177d17b4941610de19f5cc6210700cb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 12 Nov 2018 21:44:56 +0300 Subject: db_* functions replaced with g_plugin calls --- plugins/Weather/src/weather.cpp | 4 +- plugins/Weather/src/weather_addstn.cpp | 4 +- plugins/Weather/src/weather_contacts.cpp | 6 +- plugins/Weather/src/weather_data.cpp | 2 +- plugins/Weather/src/weather_mwin.cpp | 2 +- plugins/Weather/src/weather_opt.cpp | 136 +++++++++++++++---------------- plugins/Weather/src/weather_svcs.cpp | 4 +- plugins/Weather/src/weather_update.cpp | 2 +- 8 files changed, 80 insertions(+), 80 deletions(-) (limited to 'plugins/Weather') diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index 5ecdb7f4a5..d8720af41d 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -77,7 +77,7 @@ static const PLUGININFOEX pluginInfoEx = CMPlugin::CMPlugin() : PLUGIN(WEATHERPROTONAME, pluginInfoEx) { - opt.NoProtoCondition = db_get_b(NULL, WEATHERPROTONAME, "NoStatus", true); + opt.NoProtoCondition = db_get_b(0, WEATHERPROTONAME, "NoStatus", true); RegisterProtocol((opt.NoProtoCondition) ? PROTOTYPE_VIRTUAL : PROTOTYPE_PROTOCOL); SetUniqueId("ID"); } @@ -111,7 +111,7 @@ int OnToolbarLoaded(WPARAM, LPARAM) ttb.pszTooltipDn = LPGEN("Auto Update Disabled"); ttb.hIconHandleUp = GetIconHandle("main"); ttb.hIconHandleDn = GetIconHandle("disabled"); - ttb.dwFlags = (db_get_b(NULL, WEATHERPROTONAME, "AutoUpdate", 1) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; + ttb.dwFlags = (db_get_b(0, WEATHERPROTONAME, "AutoUpdate", 1) ? 0 : TTBBF_PUSHED) | TTBBF_ASPUSHBUTTON | TTBBF_VISIBLE; hTBButton = g_plugin.addTTB(&ttb); return 0; } diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index 04dafdaef9..686fe935c5 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -113,7 +113,7 @@ INT_PTR WeatherAddToList(WPARAM, LPARAM lParam) db_free(&dbv); MessageBox(nullptr, str, TranslateT("Weather Protocol"), MB_OK | MB_ICONINFORMATION); } - db_set_ws(NULL, WEATHERPROTONAME, "Default", opt.Default); + db_set_ws(0, WEATHERPROTONAME, "Default", opt.Default); } // display the Edit Settings dialog box EditSettings(hContact, 0); @@ -426,7 +426,7 @@ int NameSearch(wchar_t *name, const int searchId) // add a new weather station via find/add dialog int WeatherAdd(WPARAM, LPARAM) { - db_set_s(NULL, "FindAdd", "LastSearched", "Weather"); + db_set_s(0, "FindAdd", "LastSearched", "Weather"); CallService(MS_FINDADD_FINDADD, 0, 0); return 0; } diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 62fdf93ffc..2f1b66d03d 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -345,7 +345,7 @@ static INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPA if ((BYTE)IsDlgButtonChecked(hwndDlg, IDC_DEFA)) { // if default station is set mir_wstrcpy(opt.Default, str); opt.DefStn = hContact; - db_set_ws(NULL, WEATHERPROTONAME, "Default", opt.Default); + db_set_ws(0, WEATHERPROTONAME, "Default", opt.Default); } GetDlgItemText(hwndDlg, IDC_NAME, city, _countof(city)); db_set_ws(hContact, WEATHERPROTONAME, "Nick", city); @@ -461,7 +461,7 @@ int ContactDeleted(WPARAM wParam, LPARAM) mir_snwprintf(str, TranslateT("%s is now the default weather station"), (wchar_t*)tszNick); MessageBox(nullptr, str, TranslateT("Weather Protocol"), MB_OK | MB_ICONINFORMATION); } - db_set_ws(NULL, WEATHERPROTONAME, "Default", opt.Default); + db_set_ws(0, WEATHERPROTONAME, "Default", opt.Default); return 0; // exit this function quickly } } @@ -469,7 +469,7 @@ int ContactDeleted(WPARAM wParam, LPARAM) // got here if no more weather station left opt.Default[0] = 0; // no default station opt.DefStn = NULL; - db_set_ws(NULL, WEATHERPROTONAME, "Default", opt.Default); + db_set_ws(0, WEATHERPROTONAME, "Default", opt.Default); return 0; } diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index 8137b19c0d..dfe095e386 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -175,7 +175,7 @@ void EraseAllInfo() } } // save option in case of default station changed - db_set_ws(NULL, WEATHERPROTONAME, "Default", opt.Default); + db_set_ws(0, WEATHERPROTONAME, "Default", opt.Default); } void ConvertDataValue(WIDATAITEM *UpdateData, wchar_t *Data) diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index 9c5e098dfd..7f7992a6b0 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -154,7 +154,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara } } - clr = db_get_dw(NULL, WEATHERPROTONAME, "ColorMwinFrame", GetSysColor(COLOR_3DFACE)); + clr = db_get_dw(0, WEATHERPROTONAME, "ColorMwinFrame", GetSysColor(COLOR_3DFACE)); fntc = Font_GetW(_A2W(WEATHERPROTONAME), LPGENW("Frame Font"), &lfnt); fntc1 = Font_GetW(_A2W(WEATHERPROTONAME), LPGENW("Frame Title Font"), &lfnt1); diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 4a4beb67d1..3bb684331e 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -97,28 +97,28 @@ void LoadOptions(void) memset(&opt, 0, sizeof(opt)); // main options - opt.StartupUpdate = db_get_b(NULL, WEATHERPROTONAME, "StartupUpdate", true); - opt.AutoUpdate = db_get_b(NULL, WEATHERPROTONAME, "AutoUpdate", true); - opt.UpdateTime = db_get_w(NULL, WEATHERPROTONAME, "UpdateTime", 30); - opt.NoProtoCondition = db_get_b(NULL, WEATHERPROTONAME, "NoStatus", true); - opt.UpdateOnlyConditionChanged = db_get_b(NULL, WEATHERPROTONAME, "CondChangeAsUpdate", true); - opt.RemoveOldData = db_get_b(NULL, WEATHERPROTONAME, "RemoveOld", false); - opt.MakeItalic = db_get_b(NULL, WEATHERPROTONAME, "MakeItalic", true); - opt.AvatarSize = db_get_b(NULL, WEATHERPROTONAME, "AvatarSize", 128); + opt.StartupUpdate = db_get_b(0, WEATHERPROTONAME, "StartupUpdate", true); + opt.AutoUpdate = db_get_b(0, WEATHERPROTONAME, "AutoUpdate", true); + opt.UpdateTime = db_get_w(0, WEATHERPROTONAME, "UpdateTime", 30); + opt.NoProtoCondition = db_get_b(0, WEATHERPROTONAME, "NoStatus", true); + opt.UpdateOnlyConditionChanged = db_get_b(0, WEATHERPROTONAME, "CondChangeAsUpdate", true); + opt.RemoveOldData = db_get_b(0, WEATHERPROTONAME, "RemoveOld", false); + opt.MakeItalic = db_get_b(0, WEATHERPROTONAME, "MakeItalic", true); + opt.AvatarSize = db_get_b(0, WEATHERPROTONAME, "AvatarSize", 128); // units - opt.tUnit = db_get_w(NULL, WEATHERPROTONAME, "tUnit", 1); - opt.wUnit = db_get_w(NULL, WEATHERPROTONAME, "wUnit", 2); - opt.vUnit = db_get_w(NULL, WEATHERPROTONAME, "vUnit", 1); - opt.pUnit = db_get_w(NULL, WEATHERPROTONAME, "pUnit", 4); - opt.dUnit = db_get_w(NULL, WEATHERPROTONAME, "dUnit", 1); - opt.eUnit = db_get_w(NULL, WEATHERPROTONAME, "eUnit", 2); + opt.tUnit = db_get_w(0, WEATHERPROTONAME, "tUnit", 1); + opt.wUnit = db_get_w(0, WEATHERPROTONAME, "wUnit", 2); + opt.vUnit = db_get_w(0, WEATHERPROTONAME, "vUnit", 1); + opt.pUnit = db_get_w(0, WEATHERPROTONAME, "pUnit", 4); + opt.dUnit = db_get_w(0, WEATHERPROTONAME, "dUnit", 1); + opt.eUnit = db_get_w(0, WEATHERPROTONAME, "eUnit", 2); ptrW szValue(db_get_wsa(NULL, WEATHERPROTONAME, "DegreeSign")); wcsncpy_s(opt.DegreeSign, (szValue == NULL) ? L"" : szValue, _TRUNCATE); - opt.DoNotAppendUnit = db_get_b(NULL, WEATHERPROTONAME, "DoNotAppendUnit", 0); - opt.NoFrac = db_get_b(NULL, WEATHERPROTONAME, "NoFractions", 0); + opt.DoNotAppendUnit = db_get_b(0, WEATHERPROTONAME, "DoNotAppendUnit", 0); + opt.NoFrac = db_get_b(0, WEATHERPROTONAME, "NoFractions", 0); // texts if (szValue = db_get_wsa(NULL, WEATHERPROTONAME, "DisplayText")) @@ -162,22 +162,22 @@ void LoadOptions(void) SetTextDefault("S"); // advanced - opt.DisCondIcon = db_get_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", false); + opt.DisCondIcon = db_get_b(0, WEATHERPROTONAME, "DisableConditionIcon", false); // popup options - opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopUp", true); - opt.UpdatePopup = db_get_b(NULL, WEATHERPROTONAME, "UpdatePopup", true); - opt.AlertPopup = db_get_b(NULL, WEATHERPROTONAME, "AlertPopup", true); - opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopUpOnChange", true); - opt.ShowWarnings = db_get_b(NULL, WEATHERPROTONAME, "ShowWarnings", true); + opt.UsePopup = db_get_b(0, WEATHERPROTONAME, "UsePopUp", true); + opt.UpdatePopup = db_get_b(0, WEATHERPROTONAME, "UpdatePopup", true); + opt.AlertPopup = db_get_b(0, WEATHERPROTONAME, "AlertPopup", true); + opt.PopupOnChange = db_get_b(0, WEATHERPROTONAME, "PopUpOnChange", true); + opt.ShowWarnings = db_get_b(0, WEATHERPROTONAME, "ShowWarnings", true); // popup colors - opt.BGColour = db_get_dw(NULL, WEATHERPROTONAME, "BackgroundColour", GetSysColor(COLOR_BTNFACE)); - opt.TextColour = db_get_dw(NULL, WEATHERPROTONAME, "TextColour", GetSysColor(COLOR_WINDOWTEXT)); - opt.UseWinColors = (BOOL)db_get_b(NULL, WEATHERPROTONAME, "UseWinColors", false); + opt.BGColour = db_get_dw(0, WEATHERPROTONAME, "BackgroundColour", GetSysColor(COLOR_BTNFACE)); + opt.TextColour = db_get_dw(0, WEATHERPROTONAME, "TextColour", GetSysColor(COLOR_WINDOWTEXT)); + opt.UseWinColors = (BOOL)db_get_b(0, WEATHERPROTONAME, "UseWinColors", false); // popup actions - opt.LeftClickAction = db_get_dw(NULL, WEATHERPROTONAME, "LeftClickAction", IDM_M2); - opt.RightClickAction = db_get_dw(NULL, WEATHERPROTONAME, "RightClickAction", IDM_M1); + opt.LeftClickAction = db_get_dw(0, WEATHERPROTONAME, "LeftClickAction", IDM_M2); + opt.RightClickAction = db_get_dw(0, WEATHERPROTONAME, "RightClickAction", IDM_M1); // popup delay - opt.pDelay = db_get_dw(NULL, WEATHERPROTONAME, "PopupDelay", 0); + opt.pDelay = db_get_dw(0, WEATHERPROTONAME, "PopupDelay", 0); // popup texts if (szValue = db_get_wsa(NULL, WEATHERPROTONAME, "PopupTitle")) wSetData(&opt.pTitle, szValue); @@ -200,55 +200,55 @@ void LoadOptions(void) void SaveOptions(void) { // main options - db_set_b(NULL, WEATHERPROTONAME, "StartupUpdate", (BYTE)opt.StartupUpdate); - db_set_b(NULL, WEATHERPROTONAME, "AutoUpdate", (BYTE)opt.AutoUpdate); - db_set_w(NULL, WEATHERPROTONAME, "UpdateTime", opt.UpdateTime); - db_set_b(NULL, WEATHERPROTONAME, "NoStatus", (BYTE)opt.NoProtoCondition); - db_set_b(NULL, WEATHERPROTONAME, "CondChangeAsUpdate", (BYTE)opt.UpdateOnlyConditionChanged); - db_set_b(NULL, WEATHERPROTONAME, "RemoveOld", (BYTE)opt.RemoveOldData); - db_set_b(NULL, WEATHERPROTONAME, "MakeItalic", (BYTE)opt.MakeItalic); - db_set_b(NULL, WEATHERPROTONAME, "AvatarSize", (BYTE)opt.AvatarSize); + db_set_b(0, WEATHERPROTONAME, "StartupUpdate", (BYTE)opt.StartupUpdate); + db_set_b(0, WEATHERPROTONAME, "AutoUpdate", (BYTE)opt.AutoUpdate); + db_set_w(0, WEATHERPROTONAME, "UpdateTime", opt.UpdateTime); + db_set_b(0, WEATHERPROTONAME, "NoStatus", (BYTE)opt.NoProtoCondition); + db_set_b(0, WEATHERPROTONAME, "CondChangeAsUpdate", (BYTE)opt.UpdateOnlyConditionChanged); + db_set_b(0, WEATHERPROTONAME, "RemoveOld", (BYTE)opt.RemoveOldData); + db_set_b(0, WEATHERPROTONAME, "MakeItalic", (BYTE)opt.MakeItalic); + db_set_b(0, WEATHERPROTONAME, "AvatarSize", (BYTE)opt.AvatarSize); // units - db_set_w(NULL, WEATHERPROTONAME, "tUnit", opt.tUnit); - db_set_w(NULL, WEATHERPROTONAME, "wUnit", opt.wUnit); - db_set_w(NULL, WEATHERPROTONAME, "vUnit", opt.vUnit); - db_set_w(NULL, WEATHERPROTONAME, "pUnit", opt.pUnit); - db_set_w(NULL, WEATHERPROTONAME, "dUnit", opt.dUnit); - db_set_w(NULL, WEATHERPROTONAME, "eUnit", opt.eUnit); - db_set_ws(NULL, WEATHERPROTONAME, "DegreeSign", opt.DegreeSign); - db_set_b(NULL, WEATHERPROTONAME, "DoNotAppendUnit", (BYTE)opt.DoNotAppendUnit); - db_set_b(NULL, WEATHERPROTONAME, "NoFractions", (BYTE)opt.NoFrac); + db_set_w(0, WEATHERPROTONAME, "tUnit", opt.tUnit); + db_set_w(0, WEATHERPROTONAME, "wUnit", opt.wUnit); + db_set_w(0, WEATHERPROTONAME, "vUnit", opt.vUnit); + db_set_w(0, WEATHERPROTONAME, "pUnit", opt.pUnit); + db_set_w(0, WEATHERPROTONAME, "dUnit", opt.dUnit); + db_set_w(0, WEATHERPROTONAME, "eUnit", opt.eUnit); + db_set_ws(0, WEATHERPROTONAME, "DegreeSign", opt.DegreeSign); + db_set_b(0, WEATHERPROTONAME, "DoNotAppendUnit", (BYTE)opt.DoNotAppendUnit); + db_set_b(0, WEATHERPROTONAME, "NoFractions", (BYTE)opt.NoFrac); // texts - db_set_ws(NULL, WEATHERPROTONAME, "DisplayText", opt.cText); - db_set_ws(NULL, WEATHERPROTONAME, "BriefTextTitle", opt.bTitle); - db_set_ws(NULL, WEATHERPROTONAME, "BriefText", opt.bText); - db_set_ws(NULL, WEATHERPROTONAME, "NoteText", opt.nText); - db_set_ws(NULL, WEATHERPROTONAME, "ExtText", opt.eText); - db_set_ws(NULL, WEATHERPROTONAME, "HistoryText", opt.hText); - db_set_ws(NULL, WEATHERPROTONAME, "ExtraText", opt.xText); - db_set_ws(NULL, WEATHERPROTONAME, "StatusText", opt.sText); + db_set_ws(0, WEATHERPROTONAME, "DisplayText", opt.cText); + db_set_ws(0, WEATHERPROTONAME, "BriefTextTitle", opt.bTitle); + db_set_ws(0, WEATHERPROTONAME, "BriefText", opt.bText); + db_set_ws(0, WEATHERPROTONAME, "NoteText", opt.nText); + db_set_ws(0, WEATHERPROTONAME, "ExtText", opt.eText); + db_set_ws(0, WEATHERPROTONAME, "HistoryText", opt.hText); + db_set_ws(0, WEATHERPROTONAME, "ExtraText", opt.xText); + db_set_ws(0, WEATHERPROTONAME, "StatusText", opt.sText); // advanced - db_set_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", (BYTE)opt.DisCondIcon); + db_set_b(0, WEATHERPROTONAME, "DisableConditionIcon", (BYTE)opt.DisCondIcon); // popup options - db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup); - db_set_b(NULL, WEATHERPROTONAME, "UpdatePopup", (BYTE)opt.UpdatePopup); - db_set_b(NULL, WEATHERPROTONAME, "AlertPopup", (BYTE)opt.AlertPopup); - db_set_b(NULL, WEATHERPROTONAME, "PopUpOnChange", (BYTE)opt.PopupOnChange); - db_set_b(NULL, WEATHERPROTONAME, "ShowWarnings", (BYTE)opt.ShowWarnings); + db_set_b(0, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup); + db_set_b(0, WEATHERPROTONAME, "UpdatePopup", (BYTE)opt.UpdatePopup); + db_set_b(0, WEATHERPROTONAME, "AlertPopup", (BYTE)opt.AlertPopup); + db_set_b(0, WEATHERPROTONAME, "PopUpOnChange", (BYTE)opt.PopupOnChange); + db_set_b(0, WEATHERPROTONAME, "ShowWarnings", (BYTE)opt.ShowWarnings); // popup colors - db_set_dw(NULL, WEATHERPROTONAME, "BackgroundColour", opt.BGColour); - db_set_dw(NULL, WEATHERPROTONAME, "TextColour", opt.TextColour); - db_set_b(NULL, WEATHERPROTONAME, "UseWinColors", (BYTE)opt.UseWinColors); + db_set_dw(0, WEATHERPROTONAME, "BackgroundColour", opt.BGColour); + db_set_dw(0, WEATHERPROTONAME, "TextColour", opt.TextColour); + db_set_b(0, WEATHERPROTONAME, "UseWinColors", (BYTE)opt.UseWinColors); // popup actions - db_set_dw(NULL, WEATHERPROTONAME, "LeftClickAction", opt.LeftClickAction); - db_set_dw(NULL, WEATHERPROTONAME, "RightClickAction", opt.RightClickAction); + db_set_dw(0, WEATHERPROTONAME, "LeftClickAction", opt.LeftClickAction); + db_set_dw(0, WEATHERPROTONAME, "RightClickAction", opt.RightClickAction); // popup delay - db_set_dw(NULL, WEATHERPROTONAME, "PopupDelay", opt.pDelay); + db_set_dw(0, WEATHERPROTONAME, "PopupDelay", opt.pDelay); // popup texts - db_set_ws(NULL, WEATHERPROTONAME, "PopupTitle", opt.pTitle); - db_set_ws(NULL, WEATHERPROTONAME, "PopupText", opt.pText); + db_set_ws(0, WEATHERPROTONAME, "PopupTitle", opt.pTitle); + db_set_ws(0, WEATHERPROTONAME, "PopupText", opt.pText); // misc stuff - db_set_ws(NULL, WEATHERPROTONAME, "Default", opt.Default); + db_set_ws(0, WEATHERPROTONAME, "Default", opt.Default); } //============ MAIN OPTIONS ============ diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index dba0d5004f..64fc17b9a3 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -218,7 +218,7 @@ void UpdateMenu(BOOL State) { // update option setting opt.CAutoUpdate = State; - db_set_b(NULL, WEATHERPROTONAME, "AutoUpdate", (BYTE)State); + db_set_b(0, WEATHERPROTONAME, "AutoUpdate", (BYTE)State); if (State) { // to enable auto-update Menu_ModifyItem(hEnableDisableMenu, LPGENW("Auto Update Enabled"), GetIconHandle("main")); @@ -236,7 +236,7 @@ void UpdatePopupMenu(BOOL State) { // update option setting opt.UsePopup = State; - db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup); + db_set_b(0, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup); if (State) // to enable popup Menu_ModifyItem(hEnableDisablePopupMenu, LPGENW("Disable &weather notification"), GetIconHandle("popup")); diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 81c9da2ac1..cb743fe631 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -548,7 +548,7 @@ int GetWeatherData(MCONTACT hContact) db_set_ws(hContact, WEATHERCONDITION, "Heat Index", DataValue); GetStationID(hContact, Svc, _countof(Svc)); if (!mir_wstrcmp(Svc, opt.Default)) - db_set_ws(NULL, DEFCURRENTWEATHER, _T2A(Item->Item.Name), DataValue); + db_set_ws(0, DEFCURRENTWEATHER, _T2A(Item->Item.Name), DataValue); if (!mir_wstrcmp(Item->Item.Name, L"Condition")) { wchar_t buf[128], *cbuf; mir_snwprintf(buf, L"#%s Weather", DataValue); -- cgit v1.2.3