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 --- plugins/NewXstatusNotify/src/indsnd.cpp | 2 +- plugins/NewXstatusNotify/src/main.cpp | 8 +-- plugins/NewXstatusNotify/src/options.cpp | 8 +-- plugins/NewXstatusNotify/src/options.h | 90 ++++++++++++++++---------------- plugins/NewXstatusNotify/src/popup.cpp | 2 +- 5 files changed, 55 insertions(+), 55 deletions(-) (limited to 'plugins/NewXstatusNotify/src') diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index 3c196a4d4e..8b5fe47e8f 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -299,7 +299,7 @@ __inline void SetExtraImage(HWND hwndList, HANDLE hItem, int column, int imageID void SetAllContactsIcons(HWND hwndList) { - BYTE EnableSounds, EnablePopups, EnableXStatus, EnableXLogging, EnableStatusMsg, EnableSMsgLogging; + uint8_t EnableSounds, EnablePopups, EnableXStatus, EnableXLogging, EnableStatusMsg, EnableSMsgLogging; for (auto &hContact : Contacts()) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0); diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 8e6c22d078..461d1477ca 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -77,7 +77,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_USERON ///////////////////////////////////////////////////////////////////////////////////////// -BYTE GetGender(MCONTACT hContact) +uint8_t GetGender(MCONTACT hContact) { char *szProto = Proto_GetBaseAccountName(hContact); if (szProto) { @@ -803,7 +803,7 @@ int StatusModeChanged(WPARAM wParam, LPARAM lParam) if (opt.DisablePopupGlobally) { char szSetting[12]; mir_snprintf(szSetting, "p%d", wParam); - BYTE hlpDisablePopup = g_plugin.getByte(szSetting, 0); + uint8_t hlpDisablePopup = g_plugin.getByte(szSetting, 0); if (hlpDisablePopup != opt.PopupAutoDisabled) { bool hlpPopupStatus = Popup_Enabled(); @@ -821,10 +821,10 @@ int StatusModeChanged(WPARAM wParam, LPARAM lParam) if (opt.DisableSoundGlobally) { char szSetting[12]; mir_snprintf(szSetting, "s%d", wParam); - BYTE hlpDisableSound = g_plugin.getByte(szSetting, 0); + uint8_t hlpDisableSound = g_plugin.getByte(szSetting, 0); if (hlpDisableSound != opt.SoundAutoDisabled) { - BYTE hlpUseSound = db_get_b(0, "Skin", "UseSound", 1); + uint8_t hlpUseSound = db_get_b(0, "Skin", "UseSound", 1); opt.SoundAutoDisabled = hlpDisableSound; if (hlpDisableSound) { diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index ea88177e06..c3339b35f9 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -285,7 +285,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) { char status[8]; mir_snprintf(status, "%d", i); - g_plugin.setByte(status, (BYTE)IsDlgButtonChecked(hwndDlg, i)); + g_plugin.setByte(status, (uint8_t)IsDlgButtonChecked(hwndDlg, i)); } opt.FromOffline = IsDlgButtonChecked(hwndDlg, IDC_CHK_FROMOFFLINE); @@ -439,8 +439,8 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM opt.ShowGroup = IsDlgButtonChecked(hwndDlg, IDC_SHOWGROUP); opt.PopupTimeout = GetDlgItemInt(hwndDlg, IDC_TIMEOUT_VALUE, nullptr, TRUE); opt.PopupConnectionTimeout = GetDlgItemInt(hwndDlg, IDC_CONNECTIONTIMEOUT_VALUE, nullptr, TRUE); - opt.LeftClickAction = (BYTE)SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_GETCURSEL, 0, 0); - opt.RightClickAction = (BYTE)SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_GETCURSEL, 0, 0); + opt.LeftClickAction = (uint8_t)SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_GETCURSEL, 0, 0); + opt.RightClickAction = (uint8_t)SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_GETCURSEL, 0, 0); SaveOptions(); return TRUE; @@ -830,7 +830,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA char dbSetting[128]; mir_snprintf(dbSetting, "%s_enabled", (char *)lvItem.lParam); - g_plugin.setByte(dbSetting, (BYTE)ListView_GetCheckState(hList, lvItem.iItem)); + g_plugin.setByte(dbSetting, (uint8_t)ListView_GetCheckState(hList, lvItem.iItem)); } } diff --git a/plugins/NewXstatusNotify/src/options.h b/plugins/NewXstatusNotify/src/options.h index adf561dd00..41c8c2db78 100644 --- a/plugins/NewXstatusNotify/src/options.h +++ b/plugins/NewXstatusNotify/src/options.h @@ -26,66 +26,66 @@ typedef struct tagOPTIONS { // IDD_OPT_POPUP - BYTE Colors; - BYTE ShowGroup; - BYTE ShowStatus; - BYTE UseAlternativeText; - BYTE ShowPreviousStatus; - BYTE ReadAwayMsg; + uint8_t Colors; + uint8_t ShowGroup; + uint8_t ShowStatus; + uint8_t UseAlternativeText; + uint8_t ShowPreviousStatus; + uint8_t ReadAwayMsg; int PopupTimeout; UINT PopupConnectionTimeout; - BYTE LeftClickAction; - BYTE RightClickAction; + uint8_t LeftClickAction; + uint8_t RightClickAction; // IDD_OPT_XPOPUP - BYTE PXOnConnect; - BYTE PXDisableForMusic; - BYTE PXMsgTruncate; + uint8_t PXOnConnect; + uint8_t PXDisableForMusic; + uint8_t PXMsgTruncate; DWORD PXMsgLen; // IDD_OPT_GENERAL - BYTE FromOffline; - BYTE AutoDisable; - BYTE HiddenContactsToo; - BYTE UseIndSnd; - BYTE BlinkIcon; - BYTE BlinkIcon_Status; - BYTE BlinkIcon_ForMsgs; + uint8_t FromOffline; + uint8_t AutoDisable; + uint8_t HiddenContactsToo; + uint8_t UseIndSnd; + uint8_t BlinkIcon; + uint8_t BlinkIcon_Status; + uint8_t BlinkIcon_ForMsgs; wchar_t LogFilePath[MAX_PATH]; // IDD_AUTODISABLE - BYTE OnlyGlobalChanges; - BYTE DisableSoundGlobally; - BYTE DisablePopupGlobally; + uint8_t OnlyGlobalChanges; + uint8_t DisableSoundGlobally; + uint8_t DisablePopupGlobally; // IDD_OPT_LOG - BYTE LogToFile; - BYTE LogToDB; - BYTE LogToDB_WinOpen; - BYTE LogToDB_Remove; - BYTE LogPrevious; - BYTE SMsgLogToFile; - BYTE SMsgLogToDB; - BYTE SMsgLogToDB_WinOpen; - BYTE SMsgLogToDB_Remove; + uint8_t LogToFile; + uint8_t LogToDB; + uint8_t LogToDB_WinOpen; + uint8_t LogToDB_Remove; + uint8_t LogPrevious; + uint8_t SMsgLogToFile; + uint8_t SMsgLogToDB; + uint8_t SMsgLogToDB_WinOpen; + uint8_t SMsgLogToDB_Remove; // IDD_OPT_XLOG - BYTE XLogToFile; - BYTE XLogToDB; - BYTE XLogToDB_WinOpen; - BYTE XLogToDB_Remove; - BYTE XLogDisableForMusic; + uint8_t XLogToFile; + uint8_t XLogToDB; + uint8_t XLogToDB_WinOpen; + uint8_t XLogToDB_Remove; + uint8_t XLogDisableForMusic; // IDD_OPT_SMPOPUP - BYTE PSMsgOnConnect; - BYTE PSMsgTruncate; + uint8_t PSMsgOnConnect; + uint8_t PSMsgTruncate; DWORD PSMsgLen; // OTHER - BYTE TempDisabled; - BYTE PopupAutoDisabled; - BYTE SoundAutoDisabled; - BYTE EnableLastSeen; + uint8_t TempDisabled; + uint8_t PopupAutoDisabled; + uint8_t SoundAutoDisabled; + uint8_t EnableLastSeen; } OPTIONS; typedef struct tagTEMPLATES { - BYTE PopupXFlags; - BYTE PopupSMsgFlags; - BYTE LogXFlags; - BYTE LogSMsgFlags; + uint8_t PopupXFlags; + uint8_t PopupSMsgFlags; + uint8_t LogXFlags; + uint8_t LogSMsgFlags; wchar_t PopupXstatusChanged[256]; wchar_t PopupXstatusRemoved[256]; wchar_t PopupXMsgChanged[256]; diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp index 08cb6dfd39..d9f651bc13 100644 --- a/plugins/NewXstatusNotify/src/popup.cpp +++ b/plugins/NewXstatusNotify/src/popup.cpp @@ -110,7 +110,7 @@ void QueryAwayMessage(HWND hWnd, PLUGINDATA *pdp) } } -void PopupAction(HWND hWnd, BYTE action) +void PopupAction(HWND hWnd, uint8_t action) { MCONTACT hContact = PUGetContact(hWnd); if (hContact && hContact != INVALID_CONTACT_ID) { -- cgit v1.2.3