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/HistoryStats/src/contact.cpp | 2 +- plugins/HistoryStats/src/contact.h | 2 +- plugins/HistoryStats/src/dlgfilterwords.cpp | 2 +- plugins/HistoryStats/src/dlgoption.cpp | 4 ++-- plugins/HistoryStats/src/dlgoption.h | 2 +- plugins/HistoryStats/src/dlgoption_subbase.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subcolumns.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 2 +- plugins/HistoryStats/src/iconlib.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/contact.cpp b/plugins/HistoryStats/src/contact.cpp index 433ec64da9..35d4f4dfd6 100644 --- a/plugins/HistoryStats/src/contact.cpp +++ b/plugins/HistoryStats/src/contact.cpp @@ -83,7 +83,7 @@ void Contact::addChat(bool bOutgoing, DWORD, DWORD duration) updateChatDur(duration); } -void Contact::addEvent(WORD eventType, bool bOutgoing) +void Contact::addEvent(uint16_t eventType, bool bOutgoing) { InOut* pIO = nullptr; diff --git a/plugins/HistoryStats/src/contact.h b/plugins/HistoryStats/src/contact.h index 719a2b4a21..592b739969 100644 --- a/plugins/HistoryStats/src/contact.h +++ b/plugins/HistoryStats/src/contact.h @@ -106,7 +106,7 @@ public: void endMessages() { } void addMessage(Message& msg); void addChat(bool bOutgoing, DWORD localTimestampStarted, DWORD duration); - void addEvent(WORD eventType, bool bOutgoing); + void addEvent(uint16_t eventType, bool bOutgoing); void merge(const Contact& other); // slot stuff diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index 954b277688..0b3ca5fdde 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -77,7 +77,7 @@ void DlgFilterWords::onWMInitDialog() static const struct { - WORD iconId; + uint16_t iconId; wchar_t* szTooltip; bool bDisabled; } columnBand[] = { diff --git a/plugins/HistoryStats/src/dlgoption.cpp b/plugins/HistoryStats/src/dlgoption.cpp index 1c9de1fae4..2d16102d54 100644 --- a/plugins/HistoryStats/src/dlgoption.cpp +++ b/plugins/HistoryStats/src/dlgoption.cpp @@ -89,11 +89,11 @@ void DlgOption::onWMInitDialog() static const struct { - WORD iconId; + uint16_t iconId; wchar_t* szText; wchar_t* szTooltip; bool bRight; - WORD dlgId; + uint16_t dlgId; bool bVisible; bool bDropDown; } diff --git a/plugins/HistoryStats/src/dlgoption.h b/plugins/HistoryStats/src/dlgoption.h index 2621b48ea0..b41830e064 100644 --- a/plugins/HistoryStats/src/dlgoption.h +++ b/plugins/HistoryStats/src/dlgoption.h @@ -63,7 +63,7 @@ private: DlgOption* getParent() { return m_pParent; } public: - void createWindow(DlgOption* pParent, WORD nDlgResource, const RECT& rect); + void createWindow(DlgOption* pParent, uint16_t nDlgResource, const RECT& rect); void destroyWindow(); void moveWindow(const RECT& rWnd); void show() { ShowWindow(m_hWnd, SW_SHOW); } diff --git a/plugins/HistoryStats/src/dlgoption_subbase.cpp b/plugins/HistoryStats/src/dlgoption_subbase.cpp index 813f01a8c6..624e7a6763 100644 --- a/plugins/HistoryStats/src/dlgoption_subbase.cpp +++ b/plugins/HistoryStats/src/dlgoption_subbase.cpp @@ -39,7 +39,7 @@ DlgOption::SubBase::~SubBase() { } -void DlgOption::SubBase::createWindow(DlgOption* pParent, WORD nDlgResource, const RECT& rect) +void DlgOption::SubBase::createWindow(DlgOption* pParent, uint16_t nDlgResource, const RECT& rect) { m_pParent = pParent; diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp index 6d6a28f9db..0e0e1cfe1c 100644 --- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp +++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp @@ -162,7 +162,7 @@ void DlgOption::SubColumns::onWMInitDialog() static const struct { - WORD iconId; + uint16_t iconId; wchar_t* szTooltip; bool bRight; bool bDropDown; diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index 0b3d16c9e3..ec47eccc58 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -25,7 +25,7 @@ INT_PTR CALLBACK DlgOption::SubGlobal::staticInfoProc(HWND hDlg, UINT msg, WPARA SetDlgItemText(hDlg, IDC_FEATURES, TranslateW(info.szTeaser)); SetDlgItemText(hDlg, IDC_DESCRIPTION, TranslateW(info.szDescription)); - static const WORD LinkIDs[] = { IDC_LINK2, IDC_LINK1 }; + static const uint16_t LinkIDs[] = { IDC_LINK2, IDC_LINK1 }; ext::string linkTexts = TranslateW(info.szLinkTexts); ext::string linkURLs = info.szLinkURLs; diff --git a/plugins/HistoryStats/src/iconlib.h b/plugins/HistoryStats/src/iconlib.h index 5ac891850c..31154df525 100644 --- a/plugins/HistoryStats/src/iconlib.h +++ b/plugins/HistoryStats/src/iconlib.h @@ -42,7 +42,7 @@ public: private: struct IconInfo { - WORD wID; + uint16_t wID; char* szIconName; wchar_t* szSection; wchar_t* szDescription; -- cgit v1.2.3