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/wbOSD/src/events.cpp | 6 +++--- plugins/wbOSD/src/options.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/wbOSD/src') diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp index e82fd92025..6355db4b9f 100644 --- a/plugins/wbOSD/src/events.cpp +++ b/plugins/wbOSD/src/events.cpp @@ -81,8 +81,8 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) logmsg("ContactSettingChanged1"); - WORD newStatus = cws->value.wVal; - WORD oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "OldStatus2", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX); + uint16_t newStatus = cws->value.wVal; + uint16_t oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "OldStatus2", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX); if (oldStatus == newStatus) return 0; @@ -101,7 +101,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) int ContactStatusChanged(WPARAM wParam, LPARAM lParam) { MCONTACT hContact = (MCONTACT)wParam; - WORD newStatus = HIWORD(lParam); + uint16_t newStatus = HIWORD(lParam); DWORD ann = g_plugin.getDword("announce", DEFAULT_ANNOUNCE); logmsg("ContactStatusChanged1"); diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index 3b2e777958..472411de62 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -21,7 +21,7 @@ void FillCheckBoxTree(HWND hwndTree, DWORD style) tvis.hParent = nullptr; tvis.hInsertAfter = TVI_LAST; tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE; - for (WORD status = ID_STATUS_OFFLINE; status <= ID_STATUS_MAX; status++) { + for (uint16_t status = ID_STATUS_OFFLINE; status <= ID_STATUS_MAX; status++) { tvis.item.lParam = status - ID_STATUS_OFFLINE; tvis.item.pszText = Clist_GetStatusModeDescription(status, 0); tvis.item.stateMask = TVIS_STATEIMAGEMASK; -- cgit v1.2.3