major atavism, PROTORECVEVENT, died with its own set of constants

5 files changed, 39 insertions, 42 deletions

diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index d61254228d..34e4693848 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -539,18 +539,16 @@ void CVkProto::AppendChatMessage(CVkChatInfo* vkChatInfo, VKMessageID_t iMessage
 

 		T2Utf pszBody(pwszBody);

 		

-		PROTORECVEVENT pre = {};

-		pre.szMsgId = szMid;

-		pre.timestamp = tMsgTime;

-		pre.szMessage = pszBody;

+		DB::EventInfo dbei;

+		dbei.szId = szMid;

+		dbei.timestamp = tMsgTime;

+		dbei.pBlob = pszBody;

 		if (iUserId == m_iMyUserId)

-			pre.flags |= PREF_SENT;

+			dbei.flags |= DBEF_SENT;

 		if (bIsHistory)

-			pre.flags |= PREF_CREATEREAD;

-

-		pre.szUserId = szId;

-

-		ProtoChainRecvMsg(hChatContact, &pre);

+			dbei.flags |= DBEF_READ;

+		dbei.szUserId = szId;

+		ProtoChainRecvMsg(hChatContact, dbei);

 	}

 

 	StopChatContactTyping(vkChatInfo->m_iChatId, iUserId);

diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index 1fc2a5587f..b3bc4e5424 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -55,16 +55,16 @@ void CVkProto::AddFeedEvent(CVKNewsItem& vkNewsItem)
 	MCONTACT hContact = FindUser(VK_FEED_USER, true);

 	T2Utf pszBody(vkNewsItem.wszText);

 

-	PROTORECVEVENT recv = {};

-	recv.timestamp = vkNewsItem.tDate;

-	recv.szMessage = pszBody;

+	DB::EventInfo dbei;

+	dbei.timestamp = vkNewsItem.tDate;

+	dbei.pBlob = pszBody;

 

 	if (m_vkOptions.bUseNonStandardNotifications) {

-		recv.flags = PREF_CREATEREAD;

+		dbei.flags = DBEF_READ;

 		MsgPopup(hContact, vkNewsItem.wszPopupText, vkNewsItem.wszPopupTitle);

 	}

 

-	ProtoChainRecvMsg(hContact, &recv);

+	ProtoChainRecvMsg(hContact, dbei);

 }

 

 void CVkProto::AddCListEvent(bool bNews)

diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index fb40e9b444..bb386c812d 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -273,11 +273,11 @@ void CVkProto::OnReceiveHistoryMessages(MHttpResponse *reply, AsyncHttpRequest *
 			wszBody += SetBBCString(TranslateT("Message link"), m_vkOptions.BBCForAttachments(), vkbbcUrl,

 				CMStringW(FORMAT, L"https://vk.com/im?sel=%d&msgid=%d", iUserId, iMessageId));

 

-		PROTORECVEVENT recv = {};

+		DB::EventInfo dbei;

 		if (bIsRead)

-			recv.flags |= PREF_CREATEREAD;

+			dbei.flags |= DBEF_READ;

 		if (bIsOut)

-			recv.flags |= PREF_SENT;

+			dbei.flags |= DBEF_SENT;

 

 		time_t tUpdateTime = (time_t)jnMsg["update_time"].as_int();

 		if (tUpdateTime) {

@@ -298,14 +298,14 @@ void CVkProto::OnReceiveHistoryMessages(MHttpResponse *reply, AsyncHttpRequest *
 

 		T2Utf pszBody(wszBody);

 

-		recv.timestamp = tDateTime;

-		recv.szMessage = pszBody;

-		recv.szMsgId = szMid;

+		dbei.timestamp = tDateTime;

+		dbei.pBlob = pszBody;

+		dbei.szId = szMid;

 

 		if (!m_vkOptions.bShowReplyInMessage &&	szReplyId)

-			recv.szReplyId = szReplyId;

+			dbei.szReplyId = szReplyId;

 

-		ProtoChainRecvMsg(hContact, &recv);

+		ProtoChainRecvMsg(hContact, dbei);

 

 		MEVENT hDbEvent = db_event_getById(m_szModuleName, strcat(szMid, "_"));

 		if (hDbEvent)

diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp
index ced871a809..89d6ec54cc 100644
--- a/protocols/VKontakte/src/vk_messages.cpp
+++ b/protocols/VKontakte/src/vk_messages.cpp
@@ -440,30 +440,29 @@ void CVkProto::OnReceiveMessages(MHttpResponse *reply, AsyncHttpRequest *pReq)
 				wszOldMsg;

 		}

 

-		PROTORECVEVENT recv = {};

+		DB::EventInfo dbei;

 

 		if (isRead && bUseServerReadFlag)

-			recv.flags |= PREF_CREATEREAD;

+			dbei.flags |= DBEF_READ;

 

 		if (isOut)

-			recv.flags |= PREF_SENT;

+			dbei.flags |= DBEF_SENT;

 		else if (m_vkOptions.bUserForceInvisibleOnActivity && ((time(0) - tDateTime) < (60 * m_vkOptions.iInvisibleInterval)))

 			SetInvisible(hContact);

 

 		T2Utf pszBody(wszBody);

-		recv.timestamp = bEdited ? tDateTime : (m_vkOptions.bUseLocalTime ? time(0) : tDateTime);

-		recv.szMessage = pszBody;

+		dbei.timestamp = bEdited ? tDateTime : (m_vkOptions.bUseLocalTime ? time(0) : tDateTime);

+		dbei.pBlob = pszBody;

 		

 		if (!m_vkOptions.bShowReplyInMessage && szReplyId)

-			recv.szReplyId = szReplyId;

+			dbei.szReplyId = szReplyId;

 

 		debugLogA("CVkProto::OnReceiveMessages mid = %d, datetime = %d, isOut = %d, isRead = %d, iUserId = %d, Edited = %d", iMessageId, tDateTime, isOut, isRead, iUserId, (int)bEdited);

-		

 

 		if (!IsMessageExist(iMessageId, vkALL) || bEdited || (m_vkOptions.bShowReplyInMessage && szReplyId)) {

 			debugLogA("CVkProto::OnReceiveMessages new or edited message");

-			recv.szMsgId = szMid;

-			ProtoChainRecvMsg(hContact, &recv);

+			dbei.szId = szMid;

+			ProtoChainRecvMsg(hContact, dbei);

 			if (iMessageId > ReadQSWord(hContact, "lastmsgid", -1))

 				WriteQSWord(hContact, "lastmsgid", iMessageId);

 		}

@@ -479,10 +478,10 @@ void CVkProto::OnReceiveMessages(MHttpResponse *reply, AsyncHttpRequest *pReq)
 			debugLogA("CVkProto::OnReceiveMessages add attachments");

 

 			T2Utf pszAttach(wszAttachmentDescr);

-			recv.timestamp = isOut ? time(0) : tDateTime;

-			recv.szMessage = pszAttach;

-			recv.szMsgId = strcat(szMid, "_");

-			ProtoChainRecvMsg(hContact, &recv);

+			dbei.timestamp = isOut ? time(0) : tDateTime;

+			dbei.pBlob = pszAttach;

+			dbei.szId = strcat(szMid, "_");

+			ProtoChainRecvMsg(hContact, dbei);

 		}

 	}

 }

diff --git a/protocols/VKontakte/src/vk_pollserver.cpp b/protocols/VKontakte/src/vk_pollserver.cpp
index 10bd5c7e43..00c0928749 100644
--- a/protocols/VKontakte/src/vk_pollserver.cpp
+++ b/protocols/VKontakte/src/vk_pollserver.cpp
@@ -137,9 +137,9 @@ void CVkProto::PollUpdates(const JSONNode &jnUpdates)
 						m_vkOptions.BBCForAttachments(), vkbbcB) +

 					wszMsg;

 

-				PROTORECVEVENT recv = {};

+				DB::EventInfo dbei;

 				if (iUserId == m_iMyUserId)

-					recv.flags |= PREF_SENT;

+					dbei.flags |= DBEF_SENT;

 				else if (m_vkOptions.bUserForceInvisibleOnActivity && time(0) - tDateTime < 60 * m_vkOptions.iInvisibleInterval)

 					SetInvisible(hContact);

 

@@ -147,10 +147,10 @@ void CVkProto::PollUpdates(const JSONNode &jnUpdates)
 				_itoa(iMessageId, szMid, 10);

 

 				T2Utf pszMsg(wszMsg);

-				recv.timestamp = tDateTime;

-				recv.szMessage = pszMsg;

-				recv.szMsgId = szMid;

-				ProtoChainRecvMsg(hContact, &recv);

+				dbei.timestamp = tDateTime;

+				dbei.pBlob = pszMsg;

+				dbei.szId = szMid;

+				ProtoChainRecvMsg(hContact, dbei);

 			}

 			break;