From 61c3afe56d7bb2b658ed4a61d3b9aabcef0ce7e6 Mon Sep 17 00:00:00 2001 From: drbob Date: Tue, 26 Feb 2013 23:34:42 +0000 Subject: [PATCH] moved GXS Macros (e.g. IS_GROUP_SUBSCRIBED) to gxsflags so they can be used by all gxs services. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6149 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/gxs/rsgxsflags.h | 8 ++++++++ libretroshare/src/retroshare/rsgxsforums.h | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libretroshare/src/gxs/rsgxsflags.h b/libretroshare/src/gxs/rsgxsflags.h index a30c663d9..5236b8e60 100644 --- a/libretroshare/src/gxs/rsgxsflags.h +++ b/libretroshare/src/gxs/rsgxsflags.h @@ -106,4 +106,12 @@ namespace GXS_SERV { } +// GENERIC GXS MACROS +#define IS_MSG_NEW(status) (status & GXS_SERV::GXS_MSG_STATUS_UNPROCESSED) +#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_UNREAD) +#define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) +#define IS_GROUP_SUBSCRIBED(subscribeFlags) (subscribeFlags & (GXS_SERV::GROUP_SUBSCRIBE_ADMIN | GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)) + + + #endif // RSGXSFLAGS_H diff --git a/libretroshare/src/retroshare/rsgxsforums.h b/libretroshare/src/retroshare/rsgxsforums.h index cf51dce06..af25d869c 100644 --- a/libretroshare/src/retroshare/rsgxsforums.h +++ b/libretroshare/src/retroshare/rsgxsforums.h @@ -34,12 +34,6 @@ #include "gxs/rsgxsifaceimpl.h" -#define IS_MSG_NEW(status) (status & GXS_SERV::GXS_MSG_STATUS_UNPROCESSED) -#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_UNREAD) -#define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) -#define IS_GROUP_SUBSCRIBED(subscribeFlags) (subscribeFlags & (GXS_SERV::GROUP_SUBSCRIBE_ADMIN | GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)) - - /* The Main Interface Class - for information about your Peers */ class RsGxsForums;