From 62a186697df33c96dc1a6dac0f4dfc38652fb96f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 16:39:04 +0300 Subject: BYTE -> uint8_t --- src/core/stdmsg/src/chat_options.cpp | 8 ++++---- src/core/stdmsg/src/globals.h | 4 ++-- src/core/stdmsg/src/msgoptions.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 17f73d4a7a..d94f9133fc 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -229,7 +229,7 @@ class COptMainDlg : public CDlgBase for (int i = 0; i < nValues; i++, branch++) { tvi.hItem = branch->hItem; checkBoxes.GetItem(&tvi); - BYTE bChecked = (((tvi.state & TVIS_STATEIMAGEMASK) >> 12) == 1) ? 0 : 1; + uint8_t bChecked = (((tvi.state & TVIS_STATEIMAGEMASK) >> 12) == 1) ? 0 : 1; if (branch->iMode) { if (bChecked) iState |= branch->iMode; @@ -285,7 +285,7 @@ public: void OnDestroy() override { - BYTE b = checkBoxes.GetItemState(hListHeading1, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0; + uint8_t b = checkBoxes.GetItemState(hListHeading1, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0; db_set_b(0, CHAT_MODULE, "Branch1Exp", b); b = checkBoxes.GetItemState(hListHeading2, TVIS_EXPANDED) & TVIS_EXPANDED ? 1 : 0; db_set_b(0, CHAT_MODULE, "Branch2Exp", b); @@ -432,7 +432,7 @@ public: int iLen = spin4.GetPosition(); if (iLen > 0) - db_set_b(0, CHAT_MODULE, "NicklistRowDist", (BYTE)iLen); + db_set_b(0, CHAT_MODULE, "NicklistRowDist", (uint8_t)iLen); else db_unset(0, CHAT_MODULE, "NicklistRowDist"); @@ -525,7 +525,7 @@ public: else iLen = 1; g_Settings.iPopupStyle = iLen; - db_set_b(0, CHAT_MODULE, "PopupStyle", (BYTE)iLen); + db_set_b(0, CHAT_MODULE, "PopupStyle", (uint8_t)iLen); iLen = SendDlgItemMessage(m_hwnd, IDC_SPIN1, UDM_GETPOS, 0, 0); g_Settings.iPopupTimeout = iLen; diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index e156b001bc..7207ccb9c3 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -60,9 +60,9 @@ struct GlobalMessageData CMOption popupFlags; CMOption msgTimeout; CMOption nFlashMax; - CMOption iGap; + CMOption iGap; - CMOption iLoadHistory; + CMOption iLoadHistory; CMOption nLoadCount, nLoadTime; bool bSmileyInstalled = false; diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 49aeb6873b..6bf23d43fa 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -30,7 +30,7 @@ struct FontOptionsList const wchar_t* szDescr; COLORREF defColour; const wchar_t* szDefFace; - BYTE defStyle; + uint8_t defStyle; char defSize; } static const fontOptionsList[] = @@ -437,7 +437,7 @@ public: void RebuildList(CCtrlClc::TEventInfo* = nullptr) { - BYTE defType = g_dat.bTypingNew; + uint8_t defType = g_dat.bTypingNew; if (hItemNew && defType) clist.SetCheck(hItemNew, 1); @@ -541,7 +541,7 @@ public: bool OnApply() override { - BYTE bOldValue = db_get_b(0, CHAT_MODULE, "Tabs", 1); + uint8_t bOldValue = db_get_b(0, CHAT_MODULE, "Tabs", 1); db_set_b(0, CHAT_MODULE, "Tabs", m_chkTabs.GetState()); db_set_b(0, CHAT_MODULE, "TabBottom", m_chkTabsBottom.GetState()); -- cgit v1.2.3