From 1e31191afc0fbaeb211bc1f2c250ee155d21d0c0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 31 Mar 2014 14:38:25 +0000
Subject: inline method markedRead() introduced instead of bits magic

git-svn-id: http://svn.miranda-ng.org/main/trunk@8807 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Db3x_mmap/src/dbevents.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Db3x_mmap/src/dbevents.cpp')

diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp
index 7be737b1ba..81fbfa1f9d 100644
--- a/plugins/Db3x_mmap/src/dbevents.cpp
+++ b/plugins/Db3x_mmap/src/dbevents.cpp
@@ -190,7 +190,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::DeleteEvent(MCONTACT contactID, HANDLE hDbEvent)
 			}
 			DWORD ofsThis = dbeNext->ofsNext;
 			dbeNext = (DBEvent*)DBRead(ofsThis, sizeof(DBEvent), NULL);
-			if (!(dbeNext->flags & NOT_UNREAD)) {
+			if (!dbeNext->markedRead()) {
 				dbc.ofsFirstUnread = ofsThis;
 				dbc.tsFirstUnread = dbeNext->timestamp;
 				break;
@@ -298,10 +298,10 @@ STDMETHODIMP_(BOOL) CDb3Mmap::MarkEventRead(MCONTACT contactID, HANDLE hDbEvent)
 	if (dbe->signature != DBEVENT_SIGNATURE || dbc.signature != DBCONTACT_SIGNATURE)
 		return -1;
 
-	if ((dbe->flags & DBEF_READ) || (dbe->flags & DBEF_SENT))
-		return (INT_PTR)dbe->flags;
+	if (dbe->markedRead())
+		return dbe->flags;
 
-	//log1("mark read @ %08x", hContact);
+	// log1("mark read @ %08x", hContact);
 	dbe->flags |= DBEF_READ;
 	DBWrite((DWORD)hDbEvent, dbe, sizeof(DBEvent));
 	BOOL ret = dbe->flags;
@@ -314,7 +314,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::MarkEventRead(MCONTACT contactID, HANDLE hDbEvent)
 			}
 			DWORD ofsThis = dbe->ofsNext;
 			dbe = (DBEvent*)DBRead(ofsThis, sizeof(DBEvent), NULL);
-			if (!(dbe->flags & (DBEF_READ | DBEF_SENT))) {
+			if (!dbe->markedRead()) {
 				dbc.ofsFirstUnread = ofsThis;
 				dbc.tsFirstUnread = dbe->timestamp;
 				break;
@@ -385,7 +385,7 @@ STDMETHODIMP_(HANDLE) CDb3Mmap::FindFirstUnreadEvent(MCONTACT contactID)
 		DBEvent *dbe = (DBEvent*)DBRead(dwOffset, sizeof(DBEvent), NULL);
 		if (dbe->signature != DBEVENT_SIGNATURE)
 			return NULL;
-		if (dbe->contactID == contactID && !(dbe->flags & NOT_UNREAD))
+		if (dbe->contactID == contactID && !dbe->markedRead())
 			return HANDLE(dwOffset);
 		dwOffset = dbe->ofsNext;
 	}
-- 
cgit v1.2.3