WORD -> uint16_t

7 files changed, 19 insertions, 19 deletions

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
index 8ac4701159..741182c913 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
@@ -54,9 +54,9 @@ public:
 	__inline void	ampro(LPCSTR val) { _pszAMPro = val ? mir_strdup(val) : nullptr; }

 	__inline void	uidk(LPCSTR val) { _pszUIDKey = val ? mir_strdup(val) : nullptr; }

 	__inline void	uid(uint8_t val) { _dbvUID.type = DBVT_BYTE;  _dbvUID.bVal = val; }

-	__inline void	uid(WORD val) { _dbvUID.type = DBVT_WORD;  _dbvUID.wVal = val; }

+	__inline void	uid(uint16_t val) { _dbvUID.type = DBVT_WORD;  _dbvUID.wVal = val; }

 	__inline void	uid(DWORD val) { _dbvUID.type = DBVT_DWORD; _dbvUID.dVal = val; }

-	__inline void	uidn(uint8_t *val, DWORD len) { _dbvUID.type = DBVT_BLOB;  _dbvUID.pbVal = val; _dbvUID.cpbVal = (WORD)len; }

+	__inline void	uidn(uint8_t *val, DWORD len) { _dbvUID.type = DBVT_BLOB;  _dbvUID.pbVal = val; _dbvUID.cpbVal = (uint16_t)len; }

 	__inline void	uida(LPCSTR val)

 	{

 		_dbvUID.type = (_dbvUID.pszVal = mir_utf8decodeA(val)) ? DBVT_ASCIIZ : DBVT_DELETED;

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index c6abf8dc13..7b31b83f26 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -528,7 +528,7 @@ int CExImContactXML::LoadXmlElement(const TiXmlElement *xContact)
 					uid((uint8_t)atoi(pUID));

 					break;

 				case 'w':

-					uid((WORD)atoi(pUID));

+					uid((uint16_t)atoi(pUID));

 					break;

 				case 'd':

 					uid((DWORD)_atoi64(pUID));

@@ -850,7 +850,7 @@ int CExImContactXML::ImportSetting(LPCSTR pszModule, const TiXmlElement *xmlEntr
 		break;

 	case 'w':			//'w' wVal and sVal are valid

 		dbv.type = DBVT_WORD;

-		dbv.wVal = (WORD)atoi(value + 1);

+		dbv.wVal = (uint16_t)atoi(value + 1);

 		break;

 	case 'd':			//'d' dVal and lVal are valid

 		dbv.type = DBVT_DWORD;

@@ -868,7 +868,7 @@ int CExImContactXML::ImportSetting(LPCSTR pszModule, const TiXmlElement *xmlEntr
 		dbv.type = DBVT_BLOB;

 		dbv.pbVal = (uint8_t*)mir_base64_decode(value + 1, &baselen);

 		if (dbv.pbVal != nullptr)

-			dbv.cpbVal = (WORD)baselen;

+			dbv.cpbVal = (uint16_t)baselen;

 		else {

 			mir_free(dbv.pbVal);

 			return ERROR_NOT_ADDED;

@@ -928,7 +928,7 @@ int CExImContactXML::ImportEvent(LPCSTR pszModule, const TiXmlElement *xmlEvent)
 	if (tmpVal != NULL) {

 		// event owning module

 		dbei.pBlob = tmpVal;

-		dbei.cbBlob = (WORD)baselen;

+		dbei.cbBlob = (uint16_t)baselen;

 		dbei.szModule = (LPSTR)pszModule;

 		dbei.eventType = xmlEvent->IntAttribute("type");

 		dbei.flags = xmlEvent->IntAttribute("flag");

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index dfc3b85940..854c2ad622 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -85,7 +85,7 @@ static void ExportModule(MCONTACT hContact, LPCSTR pszModule, FILE *file)
 
 				case DBVT_BLOB:
 					fprintf(file, "%s=n", it);
-					for (WORD j = 0; j < dbv.cpbVal; j++)
+					for (uint16_t j = 0; j < dbv.cpbVal; j++)
 						fprintf(file, "%02X ", (uint8_t)dbv.pbVal[j]);
 					fputc('\n', file);
 					break;
@@ -321,7 +321,7 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine)
 		if (size_t brk = strspn(value, "0123456789-"))
 			*(value + brk) = 0;
 		dbv.type = DBVT_WORD;
-		dbv.wVal = (WORD)atoi(value);
+		dbv.wVal = (uint16_t)atoi(value);
 		break;
 
 	case 'd':
@@ -367,7 +367,7 @@ int ImportSetting(MCONTACT hContact, LPCSTR pszModule, LPSTR &strLine)
 	case 'N':
 		uint8_t *dest;
 		dbv.type = DBVT_BLOB;
-		dbv.cpbVal = (WORD)mir_strlen(value) / 3;
+		dbv.cpbVal = (uint16_t)mir_strlen(value) / 3;
 		dbv.pbVal = (uint8_t*)value;
 		for (dest = dbv.pbVal, value = strtok(value, " ");
 			value && *value;
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index b0272ff998..9a48a5e3fe 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -245,7 +245,7 @@ size_t CLineBuffer::operator + (const SHORT sVal)
  * return:	length of the string, added

  **/

 

-size_t CLineBuffer::operator + (const WORD wVal)

+size_t CLineBuffer::operator + (const uint16_t wVal)

 {

 	size_t cbLength = 5;

 

@@ -460,7 +460,7 @@ int CLineBuffer::fgetEncoded(FILE *inFile)
 {

 	int c;

 	CHAR hex[3];

-	WORD wAdd = 0;

+	uint16_t wAdd = 0;

 

 	hex[2] = 0;

 

@@ -1138,7 +1138,7 @@ uint8_t CVCardFileVCF::Export(uint8_t bExportUtf)
  * return:	number of characters read from the file or EOF

  **/

 

-int CVCardFileVCF::readLine(LPSTR szVCFSetting, WORD cchSetting)

+int CVCardFileVCF::readLine(LPSTR szVCFSetting, uint16_t cchSetting)

 {

 	LPSTR here;

 	int c;

@@ -1234,7 +1234,7 @@ uint8_t CVCardFileVCF::Import()
 

 					memcpy(buf, _clVal.GetBuffer(), 4);

 					buf[4] = 0;

-					db_set_w(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHYEAR, (WORD)strtol(buf, nullptr, 10));

+					db_set_w(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHYEAR, (uint16_t)strtol(buf, nullptr, 10));

 					memcpy(buf, _clVal.GetBuffer() + 4, 2);

 					buf[2] = 0;

 					db_set_b(_hContact, MOD_MBIRTHDAY, SET_CONTACT_BIRTHMONTH, (uint8_t)strtol(buf, nullptr, 10));

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
index e2f833df48..1cbb11ac3c 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
@@ -42,7 +42,7 @@ public:
 	size_t operator + (const CHAR cVal);

 	size_t operator + (const uint8_t bVal);

 	size_t operator + (const SHORT sVal);

-	size_t operator + (const WORD wVal);

+	size_t operator + (const uint16_t wVal);

 	size_t operator + (const LONG lVal);

 	size_t operator + (const DWORD dVal);

 

@@ -71,9 +71,9 @@ private:
 	FILE*       _pFile;

 	MCONTACT    _hContact;

 	const CHAR* _pszBaseProto;

-	WORD        _cbRew;

+	uint16_t        _cbRew;

 	uint8_t        _useUtf8;

-	WORD        _hasUtf8;

+	uint16_t        _hasUtf8;

 

 	size_t packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *cbRew = nullptr);

 	uint8_t   GetSetting(const CHAR *pszModule, const CHAR *pszSetting, DBVARIANT *dbv);

@@ -82,7 +82,7 @@ private:
 

 	void writeLine(const CHAR *szSet, size_t *cbRew = nullptr);

 	void writeLineEncoded(const CHAR *szSet, size_t *cbRew = nullptr);

-	int  readLine(LPSTR szVCFSetting, WORD cchSetting);

+	int  readLine(LPSTR szVCFSetting, uint16_t cchSetting);

 

 public:

 	CVCardFileVCF();

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index 09e8040a50..d5a9b3b9e9 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -61,7 +61,7 @@ INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 				break;

 

 			case IDOK:

-				WORD hiWord = 0;

+				uint16_t hiWord = 0;

 				if (IsDlgButtonChecked(hDlg, IDC_CHECK1))

 					hiWord |= EXPORT_DATA;

 				if (IsDlgButtonChecked(hDlg, IDC_CHECK2))

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
index eb1bb6328c..0152fcac9b 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
@@ -39,7 +39,7 @@ class CFileXml {
 

 	MCONTACT _hContactToWorkOn;	// contact to ex/import (NULL=owner|INVALID_HANDLE_VALUE=all|HADNLE=one user)

 

-	WORD _wExport;

+	uint16_t _wExport;

 

 	CProgress _progress;