diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/mir_options.cpp | 10 | ||||
| -rw-r--r-- | utils/mir_options.h | 4 | ||||
| -rw-r--r-- | utils/std_string_utils.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/utils/mir_options.cpp b/utils/mir_options.cpp index cc20034688..7f64f3b43c 100644 --- a/utils/mir_options.cpp +++ b/utils/mir_options.cpp @@ -107,7 +107,7 @@ static void LoadOpt(OptPageControl *ctrl, char *module) break; case CONTROL_SPIN: - *((WORD *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue); + *((uint16_t *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue); break; case CONTROL_COLOR: @@ -115,11 +115,11 @@ static void LoadOpt(OptPageControl *ctrl, char *module) break; case CONTROL_RADIO: - *((WORD *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue); + *((uint16_t *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue); break; case CONTROL_COMBO: - *((WORD *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue); + *((uint16_t *)ctrl->var) = db_get_w(0, module, ctrl->setting, ctrl->dwDefValue); break; case CONTROL_PROTOCOL_LIST: @@ -317,7 +317,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha break; case CONTROL_SPIN: - db_set_w(0, module, ctrl->setting, (WORD)SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_GETPOS, 0, 0)); + db_set_w(0, module, ctrl->setting, (uint16_t)SendDlgItemMessage(hwndDlg, ctrl->nIDSpin, UDM_GETPOS, 0, 0)); break; case CONTROL_COLOR: @@ -330,7 +330,7 @@ INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, cha break; case CONTROL_COMBO: - db_set_w(0, module, ctrl->setting, (WORD)SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0)); + db_set_w(0, module, ctrl->setting, (uint16_t)SendDlgItemMessage(hwndDlg, ctrl->nID, CB_GETCURSEL, 0, 0)); break; case CONTROL_PROTOCOL_LIST: diff --git a/utils/mir_options.h b/utils/mir_options.h index e0c43d8457..bd66914e63 100644 --- a/utils/mir_options.h +++ b/utils/mir_options.h @@ -55,8 +55,8 @@ typedef struct { FPAllowProtocol allowProtocol; unsigned int checkboxID; }; - WORD min; - WORD max; + uint16_t min; + uint16_t max; } OptPageControl; INT_PTR CALLBACK SaveOptsDlgProc(OptPageControl *controls, int controlsSize, char *module, HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/utils/std_string_utils.cpp b/utils/std_string_utils.cpp index b7024bedcf..5b7ddd5822 100644 --- a/utils/std_string_utils.cpp +++ b/utils/std_string_utils.cpp @@ -72,7 +72,7 @@ time_t utils::time::from_string(const std::string &data) return (time_t)timestamp; } -std::string utils::conversion::to_string(void* data, WORD type) +std::string utils::conversion::to_string(void* data, uint16_t type) { std::stringstream out; |