From 1039b2829a264280493ba0fa979214fe024dc70c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 26 Dec 2021 17:06:04 +0300
Subject: WORD -> uint16_t

---
 plugins/Popup/src/config.h       | 10 +++++-----
 plugins/Popup/src/def_settings.h |  2 +-
 plugins/Popup/src/main.cpp       |  2 +-
 plugins/Popup/src/opt_gen.cpp    | 12 ++++++------
 plugins/Popup/src/popup_wnd2.cpp |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/config.h b/plugins/Popup/src/config.h
index aef2844d67..74b10b996c 100644
--- a/plugins/Popup/src/config.h
+++ b/plugins/Popup/src/config.h
@@ -33,9 +33,9 @@ typedef struct tagPOPUPOPTIONS {
 	//Size&Position
 	uint8_t DynamicResize;
 	uint8_t UseMinimumWidth;
-	WORD MinimumWidth;
+	uint16_t MinimumWidth;
 	uint8_t UseMaximumWidth;
-	WORD MaximumWidth;
+	uint16_t MaximumWidth;
 	int Position;
 	int Spreading;
 	//position Popup
@@ -68,13 +68,13 @@ typedef struct tagPOPUPOPTIONS {
 	//==Page Advanced====
 	//History
 	uint8_t EnableHistory;
-	WORD HistorySize;
+	uint16_t HistorySize;
 	uint8_t UseHppHistoryLog;
 	//Avatars
 	uint8_t avatarBorders;
 	uint8_t avatarPNGBorders;
 	uint8_t avatarRadius;
-	WORD avatarSize;
+	uint16_t avatarSize;
 	uint8_t EnableAvatarUpdates;
 	//Monitor
 	uint8_t Monitor;
@@ -89,7 +89,7 @@ typedef struct tagPOPUPOPTIONS {
 	DWORD FadeIn;
 	DWORD FadeOut;
 	//Others
-	WORD MaxPopups;
+	uint16_t MaxPopups;
 } POPUPOPTIONS;
 
 //===== User wnd class =====
diff --git a/plugins/Popup/src/def_settings.h b/plugins/Popup/src/def_settings.h
index 73c2425e63..947b192374 100644
--- a/plugins/Popup/src/def_settings.h
+++ b/plugins/Popup/src/def_settings.h
@@ -151,6 +151,6 @@ enum
 	SETTING_SMILEPACKTYPE_DEFAULT = SPK_NONE
 };
 
-extern WORD SETTING_MAXIMUMWIDTH_MAX;
+extern uint16_t SETTING_MAXIMUMWIDTH_MAX;
 
 #endif
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 88d87f9df9..879018c8a1 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-WORD SETTING_MAXIMUMWIDTH_MAX = GetSystemMetrics(SM_CXSCREEN);
+uint16_t SETTING_MAXIMUMWIDTH_MAX = GetSystemMetrics(SM_CXSCREEN);
 
 #define MENUCOMMAND_HISTORY "Popup/ShowHistory"
 #define MENUCOMMAND_SVC "Popup/EnableDisableMenuCommand"
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index d81747ae06..cf034a0e71 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -484,7 +484,7 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			case PSN_APPLY:
 				// Seconds
 				g_plugin.setByte("InfiniteDelay", PopupOptions.InfiniteDelay);
-				g_plugin.setWord("Seconds", (WORD)PopupOptions.Seconds);
+				g_plugin.setWord("Seconds", (uint16_t)PopupOptions.Seconds);
 				g_plugin.setByte("LeaveHovered", PopupOptions.LeaveHovered);
 
 				// Dynamic Resize
@@ -498,11 +498,11 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				g_plugin.setByte("Position", (uint8_t)PopupOptions.Position);
 
 				// Configure popup area
-				g_plugin.setWord("gapTop", (WORD)PopupOptions.gapTop);
-				g_plugin.setWord("gapBottom", (WORD)PopupOptions.gapBottom);
-				g_plugin.setWord("gapLeft", (WORD)PopupOptions.gapLeft);
-				g_plugin.setWord("gapRight", (WORD)PopupOptions.gapRight);
-				g_plugin.setWord("spacing", (WORD)PopupOptions.spacing);
+				g_plugin.setWord("gapTop", (uint16_t)PopupOptions.gapTop);
+				g_plugin.setWord("gapBottom", (uint16_t)PopupOptions.gapBottom);
+				g_plugin.setWord("gapLeft", (uint16_t)PopupOptions.gapLeft);
+				g_plugin.setWord("gapRight", (uint16_t)PopupOptions.gapRight);
+				g_plugin.setWord("spacing", (uint16_t)PopupOptions.spacing);
 
 				// Spreading
 				g_plugin.setByte("Spreading", (uint8_t)PopupOptions.Spreading);
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index bd0b9ad530..f0c2f3ede5 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -348,7 +348,7 @@ void PopupWnd2::show()
 					for (int row = 0; row < m_bmpAnimate->getHeight(); ++row) {
 						unsigned char *pixel = (unsigned char *)m_bmpAnimate->getRow(row);
 						for (int col = 0; col < m_bmpAnimate->getWidth(); ++col) {
-							WORD alphaLevel = effect->getPixelAlpha(col, row);
+							uint16_t alphaLevel = effect->getPixelAlpha(col, row);
 							pixel[0] = (pixel[0] * alphaLevel) >> 8;
 							pixel[1] = (pixel[1] * alphaLevel) >> 8;
 							pixel[2] = (pixel[2] * alphaLevel) >> 8;
@@ -429,7 +429,7 @@ void PopupWnd2::hide()
 					for (int row = 0; row < m_bmpAnimate->getHeight(); ++row) {
 						unsigned char *pixel = (unsigned char *)m_bmpAnimate->getRow(row);
 						for (int col = 0; col < m_bmpAnimate->getWidth(); ++col) {
-							WORD alphaLevel = effect->getPixelAlpha(col, row);
+							uint16_t alphaLevel = effect->getPixelAlpha(col, row);
 							pixel[0] = (pixel[0] * alphaLevel) >> 8;
 							pixel[1] = (pixel[1] * alphaLevel) >> 8;
 							pixel[2] = (pixel[2] * alphaLevel) >> 8;
-- 
cgit v1.2.3