Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Big progress for People dialog. Phenom work.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-09-28 20:46:56 +00:00
parent 28277c53df
commit 9efc43f41c
15 changed files with 3630 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libretroshare/src/retroshare/rsgxscircles.h
View file

@ -106,13 +106,30 @@ class RsGxsCircleDetails
uint32_t mCircleType;
bool mIsExternal;
bool operator ==(const RsGxsCircleDetails& rGxsDetails) {
return ( mCircleId == rGxsDetails.mCircleId
&& mCircleName == rGxsDetails.mCircleName
&& mCircleType == rGxsDetails.mCircleType
&& mIsExternal == rGxsDetails.mIsExternal
&& mUnknownPeers == rGxsDetails.mUnknownPeers
&& mAllowedPeers == rGxsDetails.mAllowedPeers
);
}
bool operator !=(const RsGxsCircleDetails& rGxsDetails) {
return ( mCircleId != rGxsDetails.mCircleId
|| mCircleName != rGxsDetails.mCircleName
|| mCircleType != rGxsDetails.mCircleType
|| mIsExternal != rGxsDetails.mIsExternal
|| mUnknownPeers != rGxsDetails.mUnknownPeers
|| mAllowedPeers != rGxsDetails.mAllowedPeers
);
}
std::set<RsGxsId> mUnknownPeers;
std::map<RsPgpId, std::list<RsGxsId> > mAllowedPeers;
};
class RsGxsCircles: public RsGxsIfaceHelper
{
public:

2
libretroshare/src/retroshare/rsgxsifacetypes.h
View file

@ -55,6 +55,8 @@ public:
}
void operator =(const RsGxsGrpMetaData& rGxsMeta);
bool operator ==(const RsGroupMetaData& rGxsMeta);
bool operator !=(const RsGroupMetaData& rGxsMeta);
RsGxsGroupId mGroupId;
std::string mGroupName;

46
libretroshare/src/serialiser/rsgxsitems.cc
View file

@ -53,6 +53,52 @@
this->mParentGrpId = rGxsMeta.mParentGrpId;
}
bool RsGroupMetaData::operator ==(const RsGroupMetaData& rGxsMeta)
{
return ( this->mGroupId == rGxsMeta.mGroupId
&& this->mGroupName == rGxsMeta.mGroupName
&& this->mGroupFlags == rGxsMeta.mGroupFlags
&& this->mSignFlags == rGxsMeta.mSignFlags
&& this->mPublishTs == rGxsMeta.mPublishTs
&& this->mAuthorId == rGxsMeta.mAuthorId
&& this->mCircleId == rGxsMeta.mCircleId
&& this->mCircleType == rGxsMeta.mCircleType
&& this->mAuthenFlags == rGxsMeta.mAuthenFlags
&& this->mParentGrpId == rGxsMeta.mParentGrpId
&& this->mSubscribeFlags == rGxsMeta.mSubscribeFlags
&& this->mPop == rGxsMeta.mPop
&& this->mMsgCount == rGxsMeta.mMsgCount
&& this->mLastPost == rGxsMeta.mLastPost
&& this->mGroupStatus == rGxsMeta.mGroupStatus
&& this->mServiceString == rGxsMeta.mServiceString
&& this->mOriginator == rGxsMeta.mOriginator
&& this->mInternalCircle == rGxsMeta.mInternalCircle
);
}
bool RsGroupMetaData::operator !=(const RsGroupMetaData &rGxsMeta)
{
return ( this->mGroupId != rGxsMeta.mGroupId
|| this->mGroupName != rGxsMeta.mGroupName
|| this->mGroupFlags != rGxsMeta.mGroupFlags
|| this->mSignFlags != rGxsMeta.mSignFlags
|| this->mPublishTs != rGxsMeta.mPublishTs
|| this->mAuthorId != rGxsMeta.mAuthorId
|| this->mCircleId != rGxsMeta.mCircleId
|| this->mCircleType != rGxsMeta.mCircleType
|| this->mAuthenFlags != rGxsMeta.mAuthenFlags
|| this->mParentGrpId != rGxsMeta.mParentGrpId
|| this->mSubscribeFlags != rGxsMeta.mSubscribeFlags
|| this->mPop != rGxsMeta.mPop
|| this->mMsgCount != rGxsMeta.mMsgCount
|| this->mLastPost != rGxsMeta.mLastPost
|| this->mGroupStatus != rGxsMeta.mGroupStatus
|| this->mServiceString != rGxsMeta.mServiceString
|| this->mOriginator != rGxsMeta.mOriginator
|| this->mInternalCircle != rGxsMeta.mInternalCircle
);
}
std::ostream &operator<<(std::ostream &out, const RsGroupMetaData &meta)
{