From 28b81bbed5d8db354349fd787c3db4123e55d423 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Nov 2018 15:43:25 +0300 Subject: code cleaning --- plugins/AVS/src/options.cpp | 2 +- plugins/CSList/src/cslist.cpp | 4 ++-- plugins/ClientChangeNotify/src/Options.cpp | 4 ++-- plugins/ClientChangeNotify/src/Options.h | 2 +- plugins/Clist_nicer/src/clui.cpp | 2 +- plugins/Clist_nicer/src/viewmodes.cpp | 14 +++++++------- plugins/CloudFile/src/Services/google_service.cpp | 2 +- plugins/CloudFile/src/Services/yandex_service.cpp | 2 +- plugins/CmdLine/src/mimcmd_handlers.cpp | 2 +- plugins/MyDetails/src/frame.cpp | 4 ++-- plugins/NewAwaySysMod/src/Options.cpp | 4 ++-- plugins/NewAwaySysMod/src/Options.h | 2 +- plugins/Non-IM Contact/src/files.cpp | 4 ++-- plugins/Non-IM Contact/src/namereplacing.cpp | 4 ++-- plugins/PluginUpdater/src/DlgListNew.cpp | 2 +- plugins/RemovePersonalSettings/src/rps.cpp | 4 ++-- plugins/UserInfoEx/src/psp_options.cpp | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index bef7b80373..b8b43675e9 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -48,7 +48,7 @@ static void RemoveProtoPic(protoPicCacheEntry *pce) if (pce == nullptr) return; - db_unset(NULL, PPICT_MODULE, pce->szProtoname); + db_unset(0, PPICT_MODULE, pce->szProtoname); // common for all accounts if (pce->cacheType == PCE_TYPE_GLOBAL) { diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 127ed4ad26..08d8abb871 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -254,8 +254,8 @@ void importCustomStatuses(CSWindow* csw, int result) else delete si; if (result == IDYES) { - db_unset(NULL, protoName, bufTitle); - db_unset(NULL, protoName, bufMessage); + db_unset(0, protoName, bufTitle); + db_unset(0, protoName, bufMessage); } } csw->m_listview->reinitItems(csw->m_itemslist->m_list->getListHead()); diff --git a/plugins/ClientChangeNotify/src/Options.cpp b/plugins/ClientChangeNotify/src/Options.cpp index e5fcc70ca7..225a0a8309 100644 --- a/plugins/ClientChangeNotify/src/Options.cpp +++ b/plugins/ClientChangeNotify/src/Options.cpp @@ -479,7 +479,7 @@ void COptItem_TreeCtrl::CleanDBSettings(const CString &sModule, CString *sDBSett db_enum_settings(NULL, TreeDeleteEnum, sModule, &TreeDeleteEnumData); for (int i = 0; i < TreeDeleteEnumData.TreeSettings.GetSize(); i++) - db_unset(NULL, sModule, TreeDeleteEnumData.TreeSettings[i]); + db_unset(0, sModule, TreeDeleteEnumData.TreeSettings[i]); } int COptItem_TreeCtrl::GetSelectedItemID(HWND hWnd) @@ -741,7 +741,7 @@ void COptItem_ListCtrl::CleanDBSettings(const CString &sModule, CString *sDBSett db_enum_settings(NULL, ListDeleteEnum, sModule, &ListDeleteEnumData); for (int i = 0; i < ListDeleteEnumData.ListSettings.GetSize(); i++) - db_unset(NULL, sModule, ListDeleteEnumData.ListSettings[i]); + db_unset(0, sModule, ListDeleteEnumData.ListSettings[i]); } int COptItem_ListCtrl::GetSelectedItemID(HWND hWnd) diff --git a/plugins/ClientChangeNotify/src/Options.h b/plugins/ClientChangeNotify/src/Options.h index 9f464d6407..9c69b4d1bc 100644 --- a/plugins/ClientChangeNotify/src/Options.h +++ b/plugins/ClientChangeNotify/src/Options.h @@ -38,7 +38,7 @@ public: virtual void MemToWnd(HWND hWnd) { EnableWindow(GetDlgItem(hWnd, m_dlgItemID), m_bEnabled); } void DBToMemToWnd(const CString &sModule, HWND hWnd, CString *sDBSettingPrefix = NULL) { DBToMem(sModule, sDBSettingPrefix); MemToWnd(hWnd); } void WndToMemToDB(HWND hWnd, const CString &sModule, CString *sDBSettingPrefix = NULL) { WndToMem(hWnd); MemToDB(sModule, sDBSettingPrefix); } - virtual void CleanDBSettings(const CString &sModule, CString *sDBSettingPrefix = NULL) { db_unset(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting); }; // TODO: also set m_value to m_defValue? + virtual void CleanDBSettings(const CString &sModule, CString *sDBSettingPrefix = NULL) { db_unset(0, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting); }; // TODO: also set m_value to m_defValue? virtual void SetValue(INT_PTR) { m_bModified = true; } virtual void SetDefValue(INT_PTR) {} diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 182be342a1..c4e6f2db49 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1832,7 +1832,7 @@ void LoadCLUIModule(void) MessageBox(nullptr, TranslateT("You need the FloatingContacts plugin, cause the embedded floating contacts were removed."), TranslateT("Warning"), MB_OK | MB_ICONWARNING); - db_unset(NULL, "CLUI", "FloaterMode"); + db_unset(0, "CLUI", "FloaterMode"); } MF_InitCheck(); diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 7b8565deae..feb5c23f5e 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -633,16 +633,16 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (szBuf) { SendDlgItemMessageA(hwndDlg, IDC_VIEWMODES, LB_GETTEXT, SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_GETCURSEL, 0, 0), (LPARAM)szBuf); mir_snprintf(szSetting, "%c%s_PF", 246, szBuf); - db_unset(NULL, CLVM_MODULE, szSetting); + db_unset(0, CLVM_MODULE, szSetting); mir_snprintf(szSetting, "%c%s_GF", 246, szBuf); - db_unset(NULL, CLVM_MODULE, szSetting); + db_unset(0, CLVM_MODULE, szSetting); mir_snprintf(szSetting, "%c%s_SM", 246, szBuf); - db_unset(NULL, CLVM_MODULE, szSetting); + db_unset(0, CLVM_MODULE, szSetting); mir_snprintf(szSetting, "%c%s_VA", 246, szBuf); - db_unset(NULL, CLVM_MODULE, szSetting); + db_unset(0, CLVM_MODULE, szSetting); mir_snprintf(szSetting, "%c%s_SSM", 246, szBuf); - db_unset(NULL, CLVM_MODULE, szSetting); - db_unset(NULL, CLVM_MODULE, szBuf); + db_unset(0, CLVM_MODULE, szSetting); + db_unset(0, CLVM_MODULE, szBuf); if (!mir_strcmp(cfg::dat.current_viewmode, szBuf) && mir_strlen(szBuf) == mir_strlen(cfg::dat.current_viewmode)) { cfg::dat.bFilterEffective = 0; Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); @@ -1025,7 +1025,7 @@ void ApplyViewMode(const char *name) if (name != nullptr) { char szSetting[256]; mir_snprintf(szSetting, "%c%s_PF", 246, name); - ptrA szProtos(db_get_sa(NULL, CLVM_MODULE, szSetting)); + ptrA szProtos(db_get_sa(0, CLVM_MODULE, szSetting)); if (mir_strlen(szProtos) >= 2) { strncpy_s(cfg::dat.protoFilter, szProtos, _TRUNCATE); cfg::dat.bFilterEffective |= CLVM_FILTER_PROTOS; diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp index 313aa5efa7..536d2ff65e 100644 --- a/plugins/CloudFile/src/Services/google_service.cpp +++ b/plugins/CloudFile/src/Services/google_service.cpp @@ -144,7 +144,7 @@ void CGDriveService::RequestAccessTokenThread(void *param) void CGDriveService::RevokeAccessTokenThread(void*) { - ptrA token(db_get_sa(NULL, GetAccountName(), "TokenSecret")); + ptrA token(db_get_sa(0, GetAccountName(), "TokenSecret")); GDriveAPI::RevokeAccessTokenRequest request(token); NLHR_PTR response(request.Send(m_hConnection)); diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp index a1472ee197..4bd0210ca1 100644 --- a/plugins/CloudFile/src/Services/yandex_service.cpp +++ b/plugins/CloudFile/src/Services/yandex_service.cpp @@ -146,7 +146,7 @@ void CYandexService::RequestAccessTokenThread(void *param) void CYandexService::RevokeAccessTokenThread(void*) { - ptrA token(db_get_sa(NULL, GetAccountName(), "TokenSecret")); + ptrA token(db_get_sa(0, GetAccountName(), "TokenSecret")); YandexAPI::RevokeAccessTokenRequest request(token); NLHR_PTR response(request.Send(m_hConnection)); diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index 0ddb5c5f6b..eafd2961f3 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -793,7 +793,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r wchar_t *module = argv[3]; wchar_t *key = argv[4]; - db_unset(NULL, _T2A(module), _T2A(key)); + db_unset(0, _T2A(module), _T2A(key)); reply->code = MIMRES_SUCCESS; mir_snwprintf(reply->message, TranslateT("Setting '%s/%s' deleted."), module, key); diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index cfe97cb2d8..f7a4b44242 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -296,7 +296,7 @@ int CreateFrame() if (flags & F_VISIBLE) CallService(MS_CLIST_FRAMES_SHFRAME, frame_id, 0); - db_unset(NULL, "MyDetails", "ForceHideFrame"); + db_unset(0, "MyDetails", "ForceHideFrame"); } if (db_get_b(0, "MyDetails", "ForceShowFrame", 0)) { @@ -304,7 +304,7 @@ int CreateFrame() if (!(flags & F_VISIBLE)) CallService(MS_CLIST_FRAMES_SHFRAME, frame_id, 0); - db_unset(NULL, "MyDetails", "ForceShowFrame"); + db_unset(0, "MyDetails", "ForceShowFrame"); } } else { diff --git a/plugins/NewAwaySysMod/src/Options.cpp b/plugins/NewAwaySysMod/src/Options.cpp index 27015af169..f28cb1f2bf 100644 --- a/plugins/NewAwaySysMod/src/Options.cpp +++ b/plugins/NewAwaySysMod/src/Options.cpp @@ -479,7 +479,7 @@ void COptItem_TreeCtrl::CleanDBSettings(const CString &sModule, CString *sDBSett db_enum_settings(NULL, TreeDeleteEnum, sModule, &TreeDeleteEnumData); for (int i = 0; i < TreeDeleteEnumData.TreeSettings.GetSize(); i++) - db_unset(NULL, sModule, TreeDeleteEnumData.TreeSettings[i]); + db_unset(0, sModule, TreeDeleteEnumData.TreeSettings[i]); } int COptItem_TreeCtrl::GetSelectedItemID(HWND hWnd) @@ -741,7 +741,7 @@ void COptItem_ListCtrl::CleanDBSettings(const CString &sModule, CString *sDBSett db_enum_settings(NULL, ListDeleteEnum, sModule, &ListDeleteEnumData); for (int i = 0; i < ListDeleteEnumData.ListSettings.GetSize(); i++) - db_unset(NULL, sModule, ListDeleteEnumData.ListSettings[i]); + db_unset(0, sModule, ListDeleteEnumData.ListSettings[i]); } int COptItem_ListCtrl::GetSelectedItemID(HWND hWnd) diff --git a/plugins/NewAwaySysMod/src/Options.h b/plugins/NewAwaySysMod/src/Options.h index 129a52a5bd..c73ba45420 100644 --- a/plugins/NewAwaySysMod/src/Options.h +++ b/plugins/NewAwaySysMod/src/Options.h @@ -39,7 +39,7 @@ public: virtual void MemToWnd(HWND hWnd) { EnableWindow(GetDlgItem(hWnd, m_dlgItemID), m_bEnabled); } void DBToMemToWnd(const CString &sModule, HWND hWnd, CString *sDBSettingPrefix = nullptr) { DBToMem(sModule, sDBSettingPrefix); MemToWnd(hWnd); } void WndToMemToDB(HWND hWnd, const CString &sModule, CString *sDBSettingPrefix = nullptr) { WndToMem(hWnd); MemToDB(sModule, sDBSettingPrefix); } - virtual void CleanDBSettings(const CString &sModule, CString *sDBSettingPrefix = nullptr) { db_unset(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting); }; // TODO: also set m_value to m_defValue? + virtual void CleanDBSettings(const CString &sModule, CString *sDBSettingPrefix = nullptr) { db_unset(0, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting); }; // TODO: also set m_value to m_defValue? virtual void SetValue(INT_PTR) { m_bModified = true; } virtual void SetDefValue(INT_PTR) {} diff --git a/plugins/Non-IM Contact/src/files.cpp b/plugins/Non-IM Contact/src/files.cpp index 8a58b495ac..a61d3a9095 100644 --- a/plugins/Non-IM Contact/src/files.cpp +++ b/plugins/Non-IM Contact/src/files.cpp @@ -233,7 +233,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) int count = SendDlgItemMessage(hwnd, IDC_FILE_LIST, CB_GETCOUNT, 0, 0) - 1; if (index == count) { mir_snprintf(fn, "fn%d", index); - db_unset(NULL, MODNAME, fn); + db_unset(0, MODNAME, fn); SendDlgItemMessage(hwnd, IDC_FILE_LIST, CB_DELETESTRING, index, 0); SendMessage(hwnd, WM_RELOADWINDOW, 0, 0); if (!index) { @@ -251,7 +251,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) mir_snprintf(fn, "fn%d", ++i); } mir_snprintf(fn, "fn%d", --i); - db_unset(NULL, MODNAME, fn); + db_unset(0, MODNAME, fn); SendDlgItemMessage(hwnd, IDC_FILE_LIST, CB_DELETESTRING, index, 0); SendMessage(hwnd, WM_RELOADWINDOW, 0, 0); } diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp index 8e93072747..d7909d7281 100644 --- a/plugins/Non-IM Contact/src/namereplacing.cpp +++ b/plugins/Non-IM Contact/src/namereplacing.cpp @@ -5,7 +5,7 @@ int readFileIntoArray(int fileNumber, char *FileContents[]) char dbSetting[20], temp[MAX_STRING_LENGTH]; mir_snprintf(dbSetting, "fn%d", fileNumber); - char *szVar = db_get_sa(NULL, MODNAME, dbSetting); + char *szVar = db_get_sa(0, MODNAME, dbSetting); if (szVar == nullptr) return 0; @@ -400,7 +400,7 @@ int lastChecked(CMStringA &szNewStr, const char *str) sscanf(&str[cbPattern], "%d", &file); mir_snprintf(szSetting, "fn%d", file); - char *szVar = db_get_sa(NULL, MODNAME, szSetting); + char *szVar = db_get_sa(0, MODNAME, szSetting); if (szVar == nullptr) return 0; diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp index b55d9ba333..52321a1dad 100644 --- a/plugins/PluginUpdater/src/DlgListNew.cpp +++ b/plugins/PluginUpdater/src/DlgListNew.cpp @@ -74,7 +74,7 @@ static void ApplyDownloads(void *param) ListView_SetItemText(hwndList, i, 1, TranslateT("Succeeded.")); if (unzip(p.File.tszDiskPath, tszMirandaPath, tszFileBack, false)) SafeDeleteFile(p.File.tszDiskPath); // remove .zip after successful update - db_unset(NULL, DB_MODULE_NEW_FILES, _T2A(p.tszOldName)); + db_unset(0, DB_MODULE_NEW_FILES, _T2A(p.tszOldName)); } else ListView_SetItemText(hwndList, i, 1, TranslateT("Failed!")); diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index d30b7073a6..a8f7ce8b90 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -224,14 +224,14 @@ void DeleteSettingEx(const char *szModule, const char *szSetting) // Delete then szSetting = dms.buffer; while (szSetting[0] != '\0') { - db_unset(NULL, szModule, szSetting); + db_unset(0, szModule, szSetting); // Get next one szSetting += mir_strlen(szSetting) + 1; } } else { - db_unset(NULL, szModule, szSetting); + db_unset(0, szModule, szSetting); } } } diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 405e1a6191..cd8ed8fb48 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -464,7 +464,7 @@ static INT_PTR CALLBACK DlgProc_AdvancedOpts(HWND hDlg, UINT uMsg, WPARAM wParam if (!Settings.EnumSettings(NULL, "SkinIcons")) for (auto &s : Settings) if (mir_strncmpi(s, "UserInfoEx", 10) == 0) - db_unset(NULL, "SkinIcons", s); + db_unset(0, "SkinIcons", s); // delete global settings DB::Module::Delete(NULL, USERINFO"Ex"); -- cgit v1.2.3