From 31acef55d317e27fb1a485040a77982460f9dac5 Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Fri, 15 Jan 2021 22:29:44 +0100
Subject: [PATCH] Fix Compil with Photo Service

CONFIG+=gxsphotoshare
---
 libretroshare/src/services/p3photoservice.cc |  2 +-
 libretroshare/src/services/p3photoservice.h  | 43 ++++++++++++--------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/libretroshare/src/services/p3photoservice.cc b/libretroshare/src/services/p3photoservice.cc
index 1547e5a7d..24e9d90b6 100644
--- a/libretroshare/src/services/p3photoservice.cc
+++ b/libretroshare/src/services/p3photoservice.cc
@@ -322,7 +322,7 @@ bool p3PhotoService::createAlbum(RsPhotoAlbum &album)
 	return submitAlbumDetails(token, album) && waitToken(token) == RsTokenService::COMPLETE;
 }
 
-bool p3PhotoService::updateAlbum(const RsPhotoAlbum &album)
+bool p3PhotoService::updateAlbum(const RsPhotoAlbum &/*album*/)
 {
 	// TODO
 	return false;
diff --git a/libretroshare/src/services/p3photoservice.h b/libretroshare/src/services/p3photoservice.h
index c8056e46a..f540d4f66 100644
--- a/libretroshare/src/services/p3photoservice.h
+++ b/libretroshare/src/services/p3photoservice.h
@@ -31,7 +31,7 @@ class p3PhotoService : public RsGenExchange, public RsPhoto
 public:
 
 	p3PhotoService(RsGeneralDataService* gds, RsNetworkExchangeService* nes, RsGixs* gixs);
-	virtual RsServiceInfo getServiceInfo();
+	virtual RsServiceInfo getServiceInfo() override;
 
 	static uint32_t photoAuthenPolicy();
 
@@ -40,38 +40,38 @@ public:
 	/*!
 	 * @return true if a change has occured
 	 */
-	bool updated();
+	bool updated() override;
 
 	/*!
 	 *
 	 */
-	void service_tick();
+	void service_tick() override;
 
 protected:
 
-	void notifyChanges(std::vector<RsGxsNotify*>& changes);
+	void notifyChanges(std::vector<RsGxsNotify*>& changes) override;
 public:
 
 	/** Requests **/
 
-	void groupsChanged(std::list<RsGxsGroupId>& grpIds);
+	void groupsChanged(std::list<RsGxsGroupId>& grpIds) override;
 
 
-	void msgsChanged(GxsMsgIdResult& msgs);
+	void msgsChanged(GxsMsgIdResult& msgs) override;
 
-	RsTokenService* getTokenService();
+	RsTokenService* getTokenService() override;
 
-	bool getGroupList(const uint32_t &token, std::list<RsGxsGroupId> &groupIds);
-	bool getMsgList(const uint32_t &token, GxsMsgIdResult& msgIds);
+	bool getGroupList(const uint32_t &token, std::list<RsGxsGroupId> &groupIds) override;
+	bool getMsgList(const uint32_t &token, GxsMsgIdResult& msgIds) override;
 
 	/* Generic Summary */
-	bool getGroupSummary(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo);
+	bool getGroupSummary(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo) override;
 
-	bool getMsgSummary(const uint32_t &token, MsgMetaResult &msgInfo);
+	bool getMsgSummary(const uint32_t &token, MsgMetaResult &msgInfo) override;
 
 	/* Specific Service Data */
-	bool getAlbum(const uint32_t &token, std::vector<RsPhotoAlbum> &albums);
-	bool getPhoto(const uint32_t &token, PhotoResult &photos);
+	bool getAlbum(const uint32_t &token, std::vector<RsPhotoAlbum> &albums) override;
+	bool getPhoto(const uint32_t &token, PhotoResult &photos) override;
 
 public:
 	/* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */
@@ -109,6 +109,13 @@ public:
 		return acknowledgeMsg(token, msgId);
 	}
 
+	//Not currently used
+	virtual bool setCommentAsRead(uint32_t& /*token*/,const RsGxsGroupId& /*gid*/,const RsGxsMessageId& /*comment_msg_id*/) override
+	{
+		return true;
+	}
+
+
 	// Blocking versions.
 	virtual bool createComment(RsGxsComment &msg) override
 	{
@@ -126,7 +133,7 @@ public:
 	 * @param token token to redeem for acknowledgement
 	 * @param album album to be submitted
 	 */
-	bool submitAlbumDetails(uint32_t& token, RsPhotoAlbum &album);
+	bool submitAlbumDetails(uint32_t& token, RsPhotoAlbum &album) override;
 
 	/*!
 	 * submits photo, which returns a token that needs
@@ -134,7 +141,7 @@ public:
 	 * @param token token to redeem for acknowledgement
 	 * @param photo photo to be submitted
 	 */
-	bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo);
+	bool submitPhoto(uint32_t& token, RsPhotoPhoto &photo) override;
 
 	/*!
 	 * submits photo comment, which returns a token that needs
@@ -152,7 +159,7 @@ public:
 	 * @param token token to redeem for acknowledgement
 	 * @param grpId the id of the group to subscribe to
 	 */
-	bool subscribeToAlbum(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe);
+	bool subscribeToAlbum(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe) override;
 
 	/*!
 	 * This allows the client service to acknowledge that their msgs has
@@ -161,7 +168,7 @@ public:
 	 * @param msgIds map of grpid->msgIds of message created/modified
 	 * @return true if token exists false otherwise
 	 */
-	bool acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId);
+	bool acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) override;
 
 	/*!
 	 * This allows the client service to acknowledge that their grps has
@@ -170,7 +177,7 @@ public:
 	 * @param msgIds vector of ids of groups created/modified
 	 * @return true if token exists false otherwise
 	 */
-	bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId);
+	bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId) override;
 
 	// Blocking versions.
 	/*!