WORD -> uint16_t

4 files changed, 8 insertions, 8 deletions

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index d23c9c7991..67625b3ccd 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -859,7 +859,7 @@ int CDccSession::SetupConnection()
 	if (di->iType == DCC_CHAT && !di->bSender || di->iType == DCC_SEND && di->bSender && di->bReverse) {
 		NETLIBOPENCONNECTION ncon = {};
 		ncon.szHost = ConvertIntegerToIP(di->dwAdr);
-		ncon.wPort = (WORD)di->iPort;
+		ncon.wPort = (uint16_t)di->iPort;
 		con = Netlib_OpenConnection(m_proto->hNetlibDCC, &ncon);
 	}
 
@@ -953,7 +953,7 @@ int CDccSession::SetupConnection()
 		// connect to the remote computer from which you are receiving the file (now all actions to take (resume/overwrite etc) have been decided
 		NETLIBOPENCONNECTION ncon = {};
 		ncon.szHost = ConvertIntegerToIP(di->dwAdr);
-		ncon.wPort = (WORD)di->iPort;
+		ncon.wPort = (uint16_t)di->iPort;
 
 		con = Netlib_OpenConnection(m_proto->hNetlibDCC, &ncon);
 	}
@@ -1024,7 +1024,7 @@ void CDccSession::DoSendFile()
 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (void *)di, 0);
 	ProtoBroadcastAck(m_proto->m_szModuleName, di->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (void *)di, 0);
 
-	WORD wPacketSize = m_proto->getWord("DCCPacketSize", 1024 * 4);
+	uint16_t wPacketSize = m_proto->getWord("DCCPacketSize", 1024 * 4);
 
 	if (wPacketSize < 256)
 		wPacketSize = 256;
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 8c55fc7fc8..28f5e032f7 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -596,7 +596,7 @@ HANDLE CIrcProto::SendFile(MCONTACT hContact, const wchar_t*, wchar_t** ppszFile
 int CIrcProto::SendMsg(MCONTACT hContact, int, const char* pszSrc)

 {

 	uint8_t bDcc = getByte(hContact, "DCC", 0);

-	WORD wStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);

+	uint16_t wStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);

 	if (bDcc && wStatus != ID_STATUS_ONLINE) {

 		ProtoBroadcastAsync(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, nullptr, (LPARAM)TranslateT("The dcc chat connection is not active"));

 		return 0;

diff --git a/protocols/IRCG/src/ircproto.h b/protocols/IRCG/src/ircproto.h
index f0792daf08..efc465f31f 100644
--- a/protocols/IRCG/src/ircproto.h
+++ b/protocols/IRCG/src/ircproto.h
@@ -118,7 +118,7 @@ struct CIrcProto : public PROTO<CIrcProto>
 	char     m_mySpecifiedHost[500];
 	char     m_mySpecifiedHostIP[50];
 	char     m_myLocalHost[50];
-	WORD     m_myLocalPort;
+	uint16_t     m_myLocalPort;
 	wchar_t *m_alias;
 	int      m_quickComboSelection;
 	int      m_onlineNotificationTime;
@@ -146,7 +146,7 @@ struct CIrcProto : public PROTO<CIrcProto>
 	uint8_t     m_DCCChatIgnore;
 	uint8_t     m_DCCPassive;
 	uint8_t     m_DCCMode;
-	WORD     m_DCCPacketSize;
+	uint16_t     m_DCCPacketSize;
 	uint8_t     m_manualHost;
 	uint8_t     m_oldStyleModes;
 	uint8_t     m_channelAwayNotification;
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 3c5285309c..9961f0be81 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -45,7 +45,7 @@ void CIrcProto::ReadSettings(TDbSetting *sets, int count)
 			*(uint8_t*)ptr = getByte(p->name, p->defValue);

 			break;

 		case DBVT_WORD:

-			*(WORD*)ptr = getWord(p->name, p->defValue);

+			*(uint16_t*)ptr = getWord(p->name, p->defValue);

 			break;

 		case DBVT_DWORD:

 			*(DWORD*)ptr = getDword(p->name, p->defValue);

@@ -100,7 +100,7 @@ void CIrcProto::WriteSettings(TDbSetting *sets, int count)
 		uint8_t *ptr = base + p->offset;

 		switch (p->type) {

 		case DBVT_BYTE:   setByte(p->name, *(uint8_t*)ptr);       break;

-		case DBVT_WORD:   setWord(p->name, *(WORD*)ptr);       break;

+		case DBVT_WORD:   setWord(p->name, *(uint16_t*)ptr);       break;

 		case DBVT_DWORD:  setDword(p->name, *(DWORD*)ptr);     break;

 

 		case DBVT_ASCIIZ: