From 50320cd39dd5653e2e51369edbdf646f1d41e5c5 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 7 Mar 2014 14:06:30 +0000 Subject: [PATCH] removed unused type RsCircleInternalId, and moved SSLId and GPGId types to proper rsids git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7175 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/gxs/rsgroups.h | 4 ++-- libretroshare/src/retroshare/rsgxscircles.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/gxs/rsgroups.h b/libretroshare/src/gxs/rsgroups.h index 3852dde9e..5a24ac826 100644 --- a/libretroshare/src/gxs/rsgroups.h +++ b/libretroshare/src/gxs/rsgroups.h @@ -74,8 +74,8 @@ #pragma once -typedef std::string SSLId ; -typedef std::string GPGId ; +typedef RsPeerId SSLId ; +typedef RsPgpId GPGId ; typedef uint64_t RsGroupId ; class RsPeerGroupInfo diff --git a/libretroshare/src/retroshare/rsgxscircles.h b/libretroshare/src/retroshare/rsgxscircles.h index 78d70b565..1cf44b75f 100644 --- a/libretroshare/src/retroshare/rsgxscircles.h +++ b/libretroshare/src/retroshare/rsgxscircles.h @@ -48,7 +48,7 @@ class RsGxsCircles; extern RsGxsCircles *rsGxsCircles; typedef RsPgpId RsPgpId; -typedef std::string RsCircleInternalId; +//typedef RsGxsCircleId RsCircleInternalId; #define GXS_CIRCLE_TYPE_PUBLIC 0x0001 #define GXS_CIRCLE_TYPE_EXTERNAL 0x0002 @@ -69,7 +69,7 @@ public: // BELOW IS NOT SERIALISED - BUT MUST BE STORED LOCALLY BY GXS. (If YOUREYESONLY) RsPeerId mOriginator; - RsCircleInternalId mInternalCircle; // if Originator == ownId, otherwise blank. + RsGxsCircleId mInternalCircle; // if Originator == ownId, otherwise blank. };