From 1039b2829a264280493ba0fa979214fe024dc70c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 17:06:04 +0300 Subject: WORD -> uint16_t --- plugins/SimpleStatusMsg/src/awaymsg.cpp | 2 +- plugins/SimpleStatusMsg/src/main.cpp | 6 +++--- plugins/SimpleStatusMsg/src/msgbox.cpp | 6 +++--- plugins/SimpleStatusMsg/src/options.cpp | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/SimpleStatusMsg') diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 80a5ac6990..7e6002a7b1 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -57,7 +57,7 @@ public: wchar_t str[256], format[128]; wchar_t *contactName = Clist_GetContactDisplayName(m_hContact, 0); char *szProto = Proto_GetBaseAccountName(m_hContact); - WORD dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE); + uint16_t dwStatus = db_get_w(m_hContact, szProto, "Status", ID_STATUS_OFFLINE); wchar_t *status = Clist_GetStatusModeDescription(dwStatus, 0); GetWindowText(m_hwnd, format, _countof(format)); diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index dae491137a..6a126d34e4 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -430,7 +430,7 @@ void SaveStatusAsCurrent(const char *szProto, int iStatus) { char szSetting[80]; mir_snprintf(szSetting, "Cur%sStatus", szProto); - g_plugin.setWord(szSetting, (WORD)iStatus); + g_plugin.setWord(szSetting, (uint16_t)iStatus); } static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVars, MCONTACT hContact) @@ -1115,7 +1115,7 @@ VOID CALLBACK SetStartupStatusGlobal(HWND hwnd, UINT, UINT_PTR idEvent, DWORD) ChangeStatusMessage(status_mode, (LPARAM)"SimpleStatusMsgGlobalStartupStatus"); else { // pseudo-currentDesiredStatusMode ;-) - g_plugin.setWord("StartupStatus", (WORD)temp_status_mode); + g_plugin.setWord("StartupStatus", (uint16_t)temp_status_mode); ChangeStatusMessage(ID_STATUS_CURRENT, (LPARAM)"SimpleStatusMsgGlobalStartupStatus"); } return; @@ -1624,7 +1624,7 @@ int CMPlugin::Load() hwndSAMsgDialog = nullptr; accounts = (PROTOACCOUNTS *)mir_alloc(sizeof(PROTOACCOUNTS)); - db_set_w(0, "CList", "Status", (WORD)ID_STATUS_OFFLINE); + db_set_w(0, "CList", "Status", (uint16_t)ID_STATUS_OFFLINE); HookEvent(ME_OPT_INITIALISE, InitOptions); HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp index 248c97eeb8..18978758fc 100644 --- a/plugins/SimpleStatusMsg/src/msgbox.cpp +++ b/plugins/SimpleStatusMsg/src/msgbox.cpp @@ -657,7 +657,7 @@ void ClearHistory(struct MsgBoxData *data, int cur_sel) mir_snprintf(buff2, "Last%sMsg", pa->szModuleName); g_plugin.setString(buff2, ""); } - g_plugin.setWord("LMMsg", (WORD)data->max_hist_msgs); + g_plugin.setWord("LMMsg", (uint16_t)data->max_hist_msgs); SendMessage(data->recent_cbex, CB_SETCURSEL, -1, 0); num_items = SendMessage(data->recent_cbex, CB_GETCOUNT, 0, 0); if (num_items == CB_ERR) @@ -1256,7 +1256,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA db_set_ws(0, "SRAway", StatusModeToDbSetting(iStatus, buff2), tszMsg); } } - g_plugin.setWord("LMMsg", (WORD)last_modified_msg); + g_plugin.setWord("LMMsg", (uint16_t)last_modified_msg); } if (!msgbox_data->m_szProto) @@ -1599,7 +1599,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA g_plugin.delSetting(buff); num_items--; } - g_plugin.setWord("DefMsgCount", (WORD)new_num_def_msgs); + g_plugin.setWord("DefMsgCount", (uint16_t)new_num_def_msgs); } ImageList_Destroy(msgbox_data->status_icons); diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index 9ae0f1de41..6d3e02a87c 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -914,7 +914,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l // g_plugin.delSetting(szSetting); mir_snprintf(szSetting, "Proto%sMaxLen", pa->szModuleName); - g_plugin.setWord(szSetting, (WORD)data->proto_msg[i + 1].max_length); + g_plugin.setWord(szSetting, (uint16_t)data->proto_msg[i + 1].max_length); mir_snprintf(szSetting, "Proto%sFlags", pa->szModuleName); g_plugin.setByte(szSetting, (uint8_t)data->proto_msg[i + 1].flags); @@ -1008,7 +1008,7 @@ static INT_PTR CALLBACK DlgVariablesOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM KillTimer(nullptr, g_uUpdateMsgTimer); int val = SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_GETPOS, 0, 0); - g_plugin.setWord("UpdateMsgInt", (WORD)val); + g_plugin.setWord("UpdateMsgInt", (uint16_t)val); if (IsDlgButtonChecked(hwndDlg, IDC_CUPDATEMSG) == BST_CHECKED && val) { g_plugin.setByte("UpdateMsgOn", (uint8_t)1); @@ -1207,7 +1207,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w mir_snprintf(setting, "Last%sMsg", pa->szModuleName); g_plugin.setString(setting, ""); } - g_plugin.setWord("LMMsg", (WORD)max_hist_msgs); + g_plugin.setWord("LMMsg", (uint16_t)max_hist_msgs); EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTHIST), FALSE); } return 0; @@ -1459,12 +1459,12 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa char szSetting[80]; mir_snprintf(szSetting, "Startup%sStatus", pa->szModuleName); - g_plugin.setWord(szSetting, (WORD)data->status[i]); + g_plugin.setWord(szSetting, (uint16_t)data->status[i]); mir_snprintf(szSetting, "Set%sStatusDelay", pa->szModuleName); - g_plugin.setWord(szSetting, (WORD)data->setdelay[i]); + g_plugin.setWord(szSetting, (uint16_t)data->setdelay[i]); } - g_plugin.setWord("SetStatusDelay", (WORD)data->setglobaldelay); + g_plugin.setWord("SetStatusDelay", (uint16_t)data->setglobaldelay); g_plugin.setByte("GlobalStatusDelay", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_SPECSET) != BST_CHECKED)); g_plugin.setByte("StartupPopupDlg", (uint8_t)(IsDlgButtonChecked(hwndDlg, IDC_POPUPDLG) == BST_CHECKED)); return TRUE; -- cgit v1.2.3