Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed crash due to using twice the same method name in p3gxscircles.h wiht json api header

Browse Source
This commit is contained in:
csoler 2021-03-08 20:51:21 +01:00
parent bc99321b14
commit 8df1f0bf41
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libretroshare/src/retroshare/rsgxscircles.h
View File

@ -301,33 +301,35 @@ public:
const std::set<RsGxsId>& gxsIdMembers = std::set<RsGxsId>(),
const std::set<RsPgpId>& localMembers = std::set<RsPgpId>() ) = 0;
/**
* @brief Edit an existing circle
* @jsonapi{development}
* @param[in] circleId Optional storage to output created circle id
* @param[in] circleName String containing cirlce name
* @param[in] circleType Circle type
* @param[in] restrictedId Optional id of a pre-existent circle that see the
* created circle. Meaningful only if circleType == EXTERNAL, must be null
* in all other cases.
* @param[in] authorId Optional author of the circle.
* @param[in] gxsIdMembers GXS ids of the members of the circle.
* @param[in] localMembers PGP ids of the members if the circle.
* @return false if something failed, true otherwhise
*/
virtual bool editCircle( const RsGxsCircleId& circleId, const std::string& circleName, RsGxsCircleType circleType,
const RsGxsCircleId& restrictedId,
const RsGxsId& authorId, const std::set<RsGxsId>& gxsIdMembers,
const std::set<RsPgpId>& localMembers ) =0;
// TODO. If so, remove the other editCircle that has the same name, otherwise jsonapi will crash
//
// /**
// * @brief Edit an existing circle
// * @jsonapi{development}
// * @param[in] circleId Optional storage to output created circle id
// * @param[in] circleName String containing cirlce name
// * @param[in] circleType Circle type
// * @param[in] restrictedId Optional id of a pre-existent circle that see the
// * created circle. Meaningful only if circleType == EXTERNAL, must be null
// * in all other cases.
// * @param[in] authorId Optional author of the circle.
// * @param[in] gxsIdMembers GXS ids of the members of the circle.
// * @param[in] localMembers PGP ids of the members if the circle.
// * @return false if something failed, true otherwhise
// */
// virtual bool editCircle( const RsGxsCircleId& circleId, const std::string& circleName, RsGxsCircleType circleType,
// const RsGxsCircleId& restrictedId,
// const RsGxsId& authorId, const std::set<RsGxsId>& gxsIdMembers,
// const std::set<RsPgpId>& localMembers ) =0;
/**
* @brief Edit own existing circle
* @jsonapi{development}
* @param[inout] cData Circle data with modifications, storage for data
* updatedad during the operation.
* @return false if something failed, true otherwhise
*/
virtual bool editCircle(RsGxsCircleGroup& cData) = 0;
* @brief Edit own existing circle
* @jsonapi{development}
* @param[inout] cData Circle data with modifications, storage for data
* updatedad during the operation.
* @return false if something failed, true otherwhise
*/
virtual bool editCircle(RsGxsCircleGroup& cData) = 0;
/**
* @brief Get circle details. Memory cached

2
libretroshare/src/services/p3gxscircles.h
View File

@ -230,7 +230,7 @@ public:
bool editCircle( const RsGxsCircleId& circleId,const std::string& circleName, RsGxsCircleType circleType,
const RsGxsCircleId& restrictedId,
const RsGxsId& authorId, const std::set<RsGxsId>& gxsIdMembers,
const std::set<RsPgpId>& localMembers ) override;
const std::set<RsPgpId>& localMembers ) ;
/// @see RsGxsCircles
bool editCircle(RsGxsCircleGroup& cData) override;