WORD -> uint16_t

5 files changed, 9 insertions, 9 deletions

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 0cf8673da1..0623a7ecd7 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -236,8 +236,8 @@ void Load_ChatModule()
 
 void Unload_ChatModule()
 {
-	db_set_w(0, CHAT_MODULE, "SplitterX", (WORD)g_Settings.iSplitterX);
-	db_set_w(0, CHAT_MODULE, "SplitterY", (WORD)g_Settings.iSplitterY);
+	db_set_w(0, CHAT_MODULE, "SplitterX", (uint16_t)g_Settings.iSplitterX);
+	db_set_w(0, CHAT_MODULE, "SplitterY", (uint16_t)g_Settings.iSplitterY);
 	db_set_dw(0, CHAT_MODULE, "roomx", g_Settings.iX);
 	db_set_dw(0, CHAT_MODULE, "roomy", g_Settings.iY);
 	db_set_dw(0, CHAT_MODULE, "roomwidth", g_Settings.iWidth);
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index d94f9133fc..62936a6fdb 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -529,7 +529,7 @@ public:
 
 		iLen = SendDlgItemMessage(m_hwnd, IDC_SPIN1, UDM_GETPOS, 0, 0);
 		g_Settings.iPopupTimeout = iLen;
-		db_set_w(0, CHAT_MODULE, "PopupTimeout", (WORD)iLen);
+		db_set_w(0, CHAT_MODULE, "PopupTimeout", (uint16_t)iLen);
 
 		db_set_dw(0, CHAT_MODULE, "PopupColorBG", g_Settings.crPUBkgColour = clrBack.GetColor());
 		db_set_dw(0, CHAT_MODULE, "PopupColorText", g_Settings.crPUTextColour = clrText.GetColor());
diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h
index 7207ccb9c3..12d06a65cf 100644
--- a/src/core/stdmsg/src/globals.h
+++ b/src/core/stdmsg/src/globals.h
@@ -55,7 +55,7 @@ struct GlobalMessageData
 	CMOption<bool> bUseStatusWinIcon;

 

 	CMOption<bool> bLimitAvatarHeight;

-	CMOption<WORD> iAvatarHeight;

+	CMOption<uint16_t> iAvatarHeight;

 

 	CMOption<DWORD> popupFlags;

 	CMOption<DWORD> msgTimeout;

@@ -63,7 +63,7 @@ struct GlobalMessageData
 	CMOption<uint8_t>  iGap;

 

 	CMOption<uint8_t>  iLoadHistory;

-	CMOption<WORD>  nLoadCount, nLoadTime;

+	CMOption<uint16_t>  nLoadCount, nLoadTime;

 

 	bool bSmileyInstalled = false;

 };

diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index b5ddbf823d..304ada7afb 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -97,8 +97,8 @@ class CMsgDialog : public CSrmmBaseDialog
 	int m_limitAvatarH = 0;

 	DWORD m_lastMessage = 0;

 	HANDLE m_hTimeZone = 0;

-	WORD m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;

-	WORD m_wMinute = 0;

+	uint16_t m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;

+	uint16_t m_wMinute = 0;

 	bool m_bIsMeta = false, m_bWindowCascaded = false, m_bNoActivate = false;

 

 public:

diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 18df3dee7f..2a88e29ba1 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -597,7 +597,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 				TranslateMenu(hSubMenu);
 
 				if (si != nullptr) {
-					WORD w = db_get_w(si->hContact, si->pszModule, "TabPosition", 0);
+					uint16_t w = db_get_w(si->hContact, si->pszModule, "TabPosition", 0);
 					if (w == 0)
 						CheckMenuItem(hSubMenu, ID_LOCKPOSITION, MF_BYCOMMAND | MF_UNCHECKED);
 					else
@@ -614,7 +614,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 					if (si != nullptr) {
 						if (!(GetMenuState(hSubMenu, ID_LOCKPOSITION, MF_BYCOMMAND)&MF_CHECKED)) {
 							if (si->hContact)
-								db_set_w(si->hContact, si->pszModule, "TabPosition", (WORD)(i + 1));
+								db_set_w(si->hContact, si->pszModule, "TabPosition", (uint16_t)(i + 1));
 						}
 						else db_unset(si->hContact, si->pszModule, "TabPosition");
 					}