WORD -> uint16_t

3 files changed, 7 insertions, 7 deletions

diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index afca4738ae..24135327e2 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -17,14 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

-WORD CSkypeProto::GetContactStatus(MCONTACT hContact)

+uint16_t CSkypeProto::GetContactStatus(MCONTACT hContact)

 {

 	return getWord(hContact, "Status", ID_STATUS_OFFLINE);

 }

 

-void CSkypeProto::SetContactStatus(MCONTACT hContact, WORD status)

+void CSkypeProto::SetContactStatus(MCONTACT hContact, uint16_t status)

 {

-	WORD oldStatus = GetContactStatus(hContact);

+	uint16_t oldStatus = GetContactStatus(hContact);

 	if (oldStatus != status) {

 		setWord(hContact, "Status", status);

 		if (status == ID_STATUS_OFFLINE)

diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp
index 9d30f6f8a6..9e3b013a20 100644
--- a/protocols/SkypeWeb/src/skype_db.cpp
+++ b/protocols/SkypeWeb/src/skype_db.cpp
@@ -38,7 +38,7 @@ MEVENT CSkypeProto::GetMessageFromDb(const char *messageId)
 	return db_event_getById(m_szModuleName, messageId);
 }
 
-MEVENT CSkypeProto::AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId)
+MEVENT CSkypeProto::AddDbEvent(uint16_t type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId)
 {
 	if (MEVENT hDbEvent = GetMessageFromDb(msgId))
 		return hDbEvent;
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 4e0782f5a4..8720fa7a46 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -248,8 +248,8 @@ private:
 	void __cdecl CSkypeProto::SendFileThread(void *p);

 

 	// contacts

-	WORD GetContactStatus(MCONTACT hContact);

-	void SetContactStatus(MCONTACT hContact, WORD status);

+	uint16_t GetContactStatus(MCONTACT hContact);

+	void SetContactStatus(MCONTACT hContact, uint16_t status);

 

 	void SetAvatarUrl(MCONTACT hContact, CMStringW &tszUrl);

 	void ReloadAvatarInfo(MCONTACT hContact);

@@ -266,7 +266,7 @@ private:
 	std::map<ULONGLONG, HANDLE> m_mpOutMessagesIds;

 

 	MEVENT GetMessageFromDb(const char *messageId);

-	MEVENT AddDbEvent(WORD type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId);

+	MEVENT AddDbEvent(uint16_t type, MCONTACT hContact, DWORD timestamp, DWORD flags, const CMStringW &content, const CMStringA &msgId);

 	void EditEvent(MCONTACT hContact, MEVENT hEvent, const CMStringW &content, time_t edit_time);

 

 	int OnSendMessage(MCONTACT hContact, int flags, const char *message);