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

Fix Warnings for 'RsGxsChannels::createComment' and

Browse Source 
'RsGxsChannels::createVote' hides overloaded virtual function

In file included from temp/moc/moc_GxsChannelGroupItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelGroupItem.h:24:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:116:15:
warning: 'RsGxsChannels::createComment' hides overloaded virtual
function [-Woverloaded-virtual]
        virtual bool createComment(RsGxsComment& comment) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:172:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createComment'
declared here: different number of parameters (2 vs 1)
        virtual bool createComment(uint32_t &token, RsGxsComment
&comment) = 0;
                     ^
In file included from temp/moc/moc_GxsChannelGroupItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelGroupItem.h:24:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:132:15:
warning: 'RsGxsChannels::createVote' hides overloaded virtual function
[-Woverloaded-virtual]
        virtual bool createVote(RsGxsVote& vote) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:173:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createVote'
declared here: different number of parameters (2 vs 1)
        virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0;
                     ^
In file included from temp/moc/moc_GxsChannelPostItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelPostItem.h:26:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:116:15:
warning: 'RsGxsChannels::createComment' hides overloaded virtual
function [-Woverloaded-virtual]
        virtual bool createComment(RsGxsComment& comment) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:172:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createComment'
declared here: different number of parameters (2 vs 1)
        virtual bool createComment(uint32_t &token, RsGxsComment
&comment) = 0;
                     ^
In file included from temp/moc/moc_GxsChannelPostItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelPostItem.h:26:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:132:15:
warning: 'RsGxsChannels::createVote' hides overloaded virtual function
[-Woverloaded-virtual]
        virtual bool createVote(RsGxsVote& vote) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:173:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createVote'
declared here: different number of parameters (2 vs 1)
        virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0;
                     ^
This commit is contained in:
Phenom 2019-02-14 21:58:33 +01:00
parent e7fa5556b0
commit 8806840989
8 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/retroshare/rsgxscommon.h
View File

@ -169,8 +169,8 @@ struct RsGxsCommentService
virtual bool getRelatedComments( uint32_t token, virtual bool getRelatedComments( uint32_t token,
std::vector<RsGxsComment> &comments ) = 0; std::vector<RsGxsComment> &comments ) = 0;
virtual bool createComment(uint32_t &token, RsGxsComment &comment) = 0; virtual bool createNewComment(uint32_t &token, RsGxsComment &comment) = 0;
virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0; virtual bool createNewVote(uint32_t &token, RsGxsVote &vote) = 0;
virtual bool acknowledgeComment( virtual bool acknowledgeComment(
uint32_t token, uint32_t token,

4
libretroshare/src/retroshare/rsposted.h
View File

@ -87,8 +87,8 @@ virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts
/* From RsGxsCommentService */ /* From RsGxsCommentService */
//virtual bool getCommentData(const uint32_t &token, std::vector<RsGxsComment> &comments) = 0; //virtual bool getCommentData(const uint32_t &token, std::vector<RsGxsComment> &comments) = 0;
//virtual bool getRelatedComments(const uint32_t &token, std::vector<RsGxsComment> &comments) = 0; //virtual bool getRelatedComments(const uint32_t &token, std::vector<RsGxsComment> &comments) = 0;
//virtual bool createComment(uint32_t &token, RsGxsComment &comment) = 0; //virtual bool createNewComment(uint32_t &token, RsGxsComment &comment) = 0;
//virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0; //virtual bool createNewVote(uint32_t &token, RsGxsVote &vote) = 0;
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) = 0; virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) = 0;

8
libretroshare/src/services/p3gxschannels.cc
View File

@ -1089,7 +1089,7 @@ bool p3GxsChannels::createChannel(RsGxsChannelGroup& channel)
bool p3GxsChannels::createComment(RsGxsComment& comment) bool p3GxsChannels::createComment(RsGxsComment& comment)
{ {
uint32_t token; uint32_t token;
if(!createComment(token, comment)) if(!createNewComment(token, comment))
{ {
std::cerr << __PRETTY_FUNCTION__ << "Error! Failed creating comment." std::cerr << __PRETTY_FUNCTION__ << "Error! Failed creating comment."
<< std::endl; << std::endl;
@ -1116,7 +1116,7 @@ bool p3GxsChannels::createComment(RsGxsComment& comment)
bool p3GxsChannels::createVote(RsGxsVote& vote) bool p3GxsChannels::createVote(RsGxsVote& vote)
{ {
uint32_t token; uint32_t token;
if(!createVote(token, vote)) if(!createNewVote(token, vote))
{ {
std::cerr << __PRETTY_FUNCTION__ << "Error! Failed creating vote." std::cerr << __PRETTY_FUNCTION__ << "Error! Failed creating vote."
<< std::endl; << std::endl;
@ -1795,7 +1795,7 @@ bool p3GxsChannels::generateComment(uint32_t &token, const RsGxsGroupId &grpId,
} }
#endif #endif
createComment(token, msg); createNewComment(token, msg);
return true; return true;
} }
@ -1846,7 +1846,7 @@ bool p3GxsChannels::generateVote(uint32_t &token, const RsGxsGroupId &grpId, con
vote.mVoteType = GXS_VOTE_DOWN; vote.mVoteType = GXS_VOTE_DOWN;
} }
createVote(token, vote); createNewVote(token, vote);
return true; return true;
} }

13
libretroshare/src/services/p3gxschannels.h
View File

@ -132,30 +132,29 @@ virtual bool getChannelDownloadDirectory(const RsGxsGroupId &groupId, std::strin
const RsGxsGroupId& grpId ) override; const RsGxsGroupId& grpId ) override;
/* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */ /* Comment service - Provide RsGxsCommentService - redirect to p3GxsCommentService */
virtual bool getCommentData(uint32_t token, std::vector<RsGxsComment> &msgs) virtual bool getCommentData(uint32_t token, std::vector<RsGxsComment> &msgs) override
{ return mCommentService->getGxsCommentData(token, msgs); } { return mCommentService->getGxsCommentData(token, msgs); }
virtual bool getRelatedComments( uint32_t token, virtual bool getRelatedComments( uint32_t token,
std::vector<RsGxsComment> &msgs ) std::vector<RsGxsComment> &msgs ) override
{ return mCommentService->getGxsRelatedComments(token, msgs); } { return mCommentService->getGxsRelatedComments(token, msgs); }
virtual bool createComment(uint32_t &token, RsGxsComment &msg) virtual bool createNewComment(uint32_t &token, RsGxsComment &msg) override
{ {
return mCommentService->createGxsComment(token, msg); return mCommentService->createGxsComment(token, msg);
} }
virtual bool createVote(uint32_t &token, RsGxsVote &msg) virtual bool createNewVote(uint32_t &token, RsGxsVote &msg) override
{ {
return mCommentService->createGxsVote(token, msg); return mCommentService->createGxsVote(token, msg);
} }
virtual bool acknowledgeComment(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) virtual bool acknowledgeComment(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) override
{ {
return acknowledgeMsg(token, msgId); return acknowledgeMsg(token, msgId);
} }
virtual bool acknowledgeVote(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) override
virtual bool acknowledgeVote(uint32_t token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId)
{ {
if (mCommentService->acknowledgeVote(token, msgId)) if (mCommentService->acknowledgeVote(token, msgId))
{ {

4
libretroshare/src/services/p3posted.h
View File

@ -89,12 +89,12 @@ virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgI
std::vector<RsGxsComment> &msgs ) std::vector<RsGxsComment> &msgs )
{ return mCommentService->getGxsRelatedComments(token, msgs); } { return mCommentService->getGxsRelatedComments(token, msgs); }
virtual bool createComment(uint32_t &token, RsGxsComment &msg) virtual bool createNewComment(uint32_t &token, RsGxsComment &msg)
{ {
return mCommentService->createGxsComment(token, msg); return mCommentService->createGxsComment(token, msg);
} }
virtual bool createVote(uint32_t &token, RsGxsVote &msg) virtual bool createNewVote(uint32_t &token, RsGxsVote &msg)
{ {
return mCommentService->createGxsVote(token, msg); return mCommentService->createGxsVote(token, msg);
} }

2
retroshare-gui/src/gui/Posted/PostedListWidget.cpp
View File

@ -262,7 +262,7 @@ void PostedListWidget::submitVote(const RsGxsGrpMsgIdPair &msgId, bool up)
std::cerr << "AuthorId : " << vote.mMeta.mAuthorId << std::endl; std::cerr << "AuthorId : " << vote.mMeta.mAuthorId << std::endl;
uint32_t token; uint32_t token;
rsPosted->createVote(token, vote); rsPosted->createNewVote(token, vote);
mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, mTokenTypeVote); mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, mTokenTypeVote);
} }

2
retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
View File

@ -271,7 +271,7 @@ void GxsCommentTreeWidget::vote(const RsGxsGroupId &groupId, const RsGxsMessageI
std::cerr << "AuthorId : " << vote.mMeta.mAuthorId << std::endl; std::cerr << "AuthorId : " << vote.mMeta.mAuthorId << std::endl;
uint32_t token; uint32_t token;
mCommentService->createVote(token, vote); mCommentService->createNewVote(token, vote);
mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, COMMENT_VOTE_ACK); mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, COMMENT_VOTE_ACK);
} }

2
retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.cpp
View File

@ -105,7 +105,7 @@ void GxsCreateCommentDialog::createComment()
}//switch (ui->idChooser->getChosenId(authorId)) }//switch (ui->idChooser->getChosenId(authorId))
uint32_t token; uint32_t token;
mCommentService->createComment(token, comment); mCommentService->createNewComment(token, comment);
mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, 0); mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, 0);
close(); close();
} }