Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 12:24:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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