PBYTE -> uint8_t*

7 files changed, 8 insertions, 8 deletions

diff --git a/protocols/SkypeWeb/src/requests/avatars.h b/protocols/SkypeWeb/src/requests/avatars.h
index 5c69ab66e2..4900d4ceef 100644
--- a/protocols/SkypeWeb/src/requests/avatars.h
+++ b/protocols/SkypeWeb/src/requests/avatars.h
@@ -30,7 +30,7 @@ struct GetAvatarRequest : public AsyncHttpRequest
 

 struct SetAvatarRequest : public AsyncHttpRequest

 {

-	SetAvatarRequest(const PBYTE data, size_t dataSize, const char *szMime, CSkypeProto *ppro) :

+	SetAvatarRequest(const uint8_t *data, size_t dataSize, const char *szMime, CSkypeProto *ppro) :

 		AsyncHttpRequest(REQUEST_PUT, HOST_API, 0, &CSkypeProto::OnSentAvatar)

 	{

 		m_szUrl.AppendFormat("/users/%s/profile/avatar", ppro->m_szSkypename.MakeLower().c_str());

diff --git a/protocols/SkypeWeb/src/requests/files.h b/protocols/SkypeWeb/src/requests/files.h
index 0b46644c7f..9d0047bf61 100644
--- a/protocols/SkypeWeb/src/requests/files.h
+++ b/protocols/SkypeWeb/src/requests/files.h
@@ -28,7 +28,7 @@ struct ASMObjectCreateRequest : public AsyncHttpRequest
 
 struct ASMObjectUploadRequest : public AsyncHttpRequest
 {
-	ASMObjectUploadRequest(CSkypeProto *ppro, const char *szObject, const PBYTE data, const size_t size, CFileUploadParam *fup) :
+	ASMObjectUploadRequest(CSkypeProto *ppro, const char *szObject, const uint8_t *data, const size_t size, CFileUploadParam *fup) :
 		AsyncHttpRequest(REQUEST_PUT, HOST_OTHER, 0, &CSkypeProto::OnASMObjectUploaded)
 	{
 		m_szUrl.AppendFormat("https://api.asm.skype.com/v1/objects/%s/content/original", szObject);
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp
index 3527817b0f..ff2a273ea3 100644
--- a/protocols/SkypeWeb/src/skype_avatars.cpp
+++ b/protocols/SkypeWeb/src/skype_avatars.cpp
@@ -169,7 +169,7 @@ INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM, LPARAM lParam)
 				if (length != -1) {

 					rewind(hFile);

 

-					mir_ptr<BYTE> data((PBYTE)mir_alloc(length));

+					mir_ptr<BYTE> data((uint8_t*)mir_alloc(length));

 

 					if (data != NULL && fread(data, sizeof(BYTE), length, hFile) == length) {

 						const char *szMime = FreeImage_GetFIFMimeType(FreeImage_GetFIFFromFilenameU(path));

diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index 4adb73e341..afca4738ae 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -44,7 +44,7 @@ MCONTACT CSkypeProto::GetContactFromAuthEvent(MEVENT hEvent)
 	DWORD body[3];

 	DBEVENTINFO dbei = {};

 	dbei.cbBlob = sizeof(DWORD) * 2;

-	dbei.pBlob = (PBYTE)&body;

+	dbei.pBlob = (uint8_t*)&body;

 

 	if (db_event_get(hEvent, &dbei))

 		return INVALID_CONTACT_ID;

diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp
index e8ac1ab738..886f3b6ddc 100644
--- a/protocols/SkypeWeb/src/skype_db.cpp
+++ b/protocols/SkypeWeb/src/skype_db.cpp
@@ -94,7 +94,7 @@ void CSkypeProto::EditEvent(MCONTACT hContact, MEVENT hEvent, const CMStringW &s
 	
 	std::string newMsg = jMsg.write().c_str();
 	dbei.cbBlob = int(newMsg.size() + 1);
-	dbei.pBlob = (PBYTE)newMsg.c_str();
+	dbei.pBlob = (uint8_t*)newMsg.c_str();
 	db_event_edit(hContact, hEvent, &dbei);
 }
 
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index fa03b94a81..61cba82d86 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -222,8 +222,8 @@ void CSkypeProto::ProcessContactRecv(MCONTACT hContact, time_t timestamp, const
 		pre.timestamp = (DWORD)timestamp;

 		pre.szMessage = (char*)psr;

 

-		PBYTE b = (PBYTE)mir_calloc(sizeof(DWORD) + mir_strlen(szMessageId) + 1);

-		PBYTE pCur = b;

+		uint8_t *b = (uint8_t*)mir_calloc(sizeof(DWORD) + mir_strlen(szMessageId) + 1);

+		uint8_t *pCur = b;

 		*((PDWORD)pCur) = nCount;

 		pCur += sizeof(DWORD);

 

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 6bc6e8e66e..c618956198 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -319,7 +319,7 @@ int CSkypeProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 	for (int i = 0; i < nCount; i++)
 		cbBlob += int(/*mir_wstrlen(isrList[i]->nick.w)*/0 + 2 + mir_wstrlen(isrList[i]->id.w) + mir_strlen(szMessageId));
 
-	BYTE *pBlob = (PBYTE)mir_calloc(cbBlob);
+	BYTE *pBlob = (uint8_t*)mir_calloc(cbBlob);
 	BYTE *pCurBlob = pBlob;
 
 	for (int i = 0; i < nCount; i++) {