From 8df1f0bf416261a6dce2667df76be0deb8d48c1f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 8 Mar 2021 20:51:21 +0100
Subject: [PATCH] fixed crash due to using twice the same method name in
 p3gxscircles.h wiht json api header

---
 libretroshare/src/retroshare/rsgxscircles.h | 52 +++++++++++----------
 libretroshare/src/services/p3gxscircles.h   |  2 +-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/libretroshare/src/retroshare/rsgxscircles.h b/libretroshare/src/retroshare/rsgxscircles.h
index 8b94bd829..32bc8e547 100644
--- a/libretroshare/src/retroshare/rsgxscircles.h
+++ b/libretroshare/src/retroshare/rsgxscircles.h
@@ -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
diff --git a/libretroshare/src/services/p3gxscircles.h b/libretroshare/src/services/p3gxscircles.h
index 3ff041ce1..e71e26ed0 100644
--- a/libretroshare/src/services/p3gxscircles.h
+++ b/libretroshare/src/services/p3gxscircles.h
@@ -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;