WORD -> uint16_t

5 files changed, 10 insertions, 10 deletions

diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index 3ad32a0b21..fcd3b9d226 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -359,7 +359,7 @@ void importSettings(MCONTACT hContact, char *utf8)
 				case 'w':

 				case 'W':

 					if (sscanf(end + 2, "%u", &value) == 1)

-						db_set_w(hContact, module, setting, (WORD)value);

+						db_set_w(hContact, module, setting, (uint16_t)value);

 					break;

 				case 'd':

 				case 'D':

diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp
index 04bb232ad7..78d74c1f6e 100644
--- a/plugins/DbEditorPP/src/main_window.cpp
+++ b/plugins/DbEditorPP/src/main_window.cpp
@@ -370,7 +370,7 @@ void CMainDlg::onChange_Splitter(CSplitter *)
 	if (m_splitterPos > rc2.right - rc2.left - 150)

 		m_splitterPos = rc2.right - rc2.left - 150;

 	SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_SPLITTER), GWLP_USERDATA, m_splitterPos);

-	g_plugin.setWord("Splitter", (WORD)m_splitterPos);

+	g_plugin.setWord("Splitter", (uint16_t)m_splitterPos);

 

 	PostMessage(m_hwnd, WM_SIZE, 0, 0);

 }

diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp
index 1ac1c76d98..27676f45e7 100644
--- a/plugins/DbEditorPP/src/settinglist.cpp
+++ b/plugins/DbEditorPP/src/settinglist.cpp
@@ -503,7 +503,7 @@ bool CMainDlg::EditLabelWndProc(HWND hwnd, UINT uMsg, WPARAM wParam)
 					case 'W':

 						val = wcstoul(&value[1], nullptr, 0);

 						if (!val || value[1] == '0')

-							res = !db_set_w(m_hContact, m_module, m_setting, (WORD)val);

+							res = !db_set_w(m_hContact, m_module, m_setting, (uint16_t)val);

 						else

 							res = setTextValue(m_hContact, m_module, m_setting, value, dbv.type);

 						break;

diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h
index eb60394086..f7c621ce44 100644
--- a/plugins/DbEditorPP/src/stdafx.h
+++ b/plugins/DbEditorPP/src/stdafx.h
@@ -49,7 +49,7 @@
 struct CMPlugin : public PLUGIN<CMPlugin>

 {

 	CMOption<bool> bExpandSettingsOnOpen, bRestoreOnOpen, bWarnOnDelete;

-	CMOption<WORD> iPopupDelay;

+	CMOption<uint16_t> iPopupDelay;

 	CMOption<DWORD> iPopupBkColor, iPopupTxtColor;

 

 	CMPlugin();

@@ -175,7 +175,7 @@ extern bool g_bUsePopups;
 #define HEX_DWORD		4

 

 // main

-char *StringFromBlob(uint8_t *blob, WORD len);

+char *StringFromBlob(uint8_t *blob, uint16_t len);

 int WriteBlobFromString(MCONTACT hContact, const char *module, const char *setting, const char *value, int len);

 wchar_t *DBVType(uint8_t type);

 DWORD getNumericValue(DBVARIANT *dbv);

diff --git a/plugins/DbEditorPP/src/utils.cpp b/plugins/DbEditorPP/src/utils.cpp
index 1979392d12..d38a5e873a 100644
--- a/plugins/DbEditorPP/src/utils.cpp
+++ b/plugins/DbEditorPP/src/utils.cpp
@@ -40,7 +40,7 @@ int ListView_SetItemTextA(HWND hwndLV, int i, int iSubItem, const char *pszText)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-char* StringFromBlob(uint8_t *blob, WORD len)
+char* StringFromBlob(uint8_t *blob, uint16_t len)
 {
 	int j;
 	char tmp[16];
@@ -81,7 +81,7 @@ int WriteBlobFromString(MCONTACT hContact, const char *szModule, const char *szS
 
 
 	if (i)
-		res = !db_set_blob(hContact, szModule, szSetting, data, (WORD)i);
+		res = !db_set_blob(hContact, szModule, szSetting, data, (uint16_t)i);
 
 	mir_free(data);
 	return res;
@@ -91,7 +91,7 @@ wchar_t* DBVType(uint8_t type)
 {
 	switch (type) {
 	case DBVT_BYTE:     return L"uint8_t";
-	case DBVT_WORD:     return L"WORD";
+	case DBVT_WORD:     return L"uint16_t";
 	case DBVT_DWORD:    return L"DWORD";
 	case DBVT_ASCIIZ:   return L"STRING";
 	case DBVT_WCHAR:
@@ -125,7 +125,7 @@ int setNumericValue(MCONTACT hContact, const char *module, const char *setting,
 
 	case DBVT_WORD:
 		if (value <= 0xFFFF)
-			return !db_set_w(hContact, module, setting, (WORD)value);
+			return !db_set_w(hContact, module, setting, (uint16_t)value);
 		break;
 
 	case DBVT_DWORD:
@@ -366,7 +366,7 @@ void saveListSettings(HWND hwnd, ColumnsSettings *cs)
 	while (cs[i].name) {
 		if (ListView_GetColumn(hwnd, cs[i].index, &sLC)) {
 			mir_snprintf(tmp, cs[i].dbname, i);
-			g_plugin.setWord(tmp, (WORD)sLC.cx);
+			g_plugin.setWord(tmp, (uint16_t)sLC.cx);
 		}
 		i++;
 	}