Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 16:09:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed VoteHolder constants to avoid compile problems under Windows because of doubled defined name ERROR when including wingdi.h.

Browse Source 
Added missing files GxsFeedItem.* to retroshare-gui.pro.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-03-16 17:20:56 +00:00
parent ea2788b2d2
commit 0e10205c0b
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/services/p3gxscommon.cc
View File

@ -534,7 +534,7 @@ void p3GxsCommentService::load_PendingVoteParent(const uint32_t &token)
std::cerr << "mMsgId: " << meta.mMsgId; std::cerr << "mMsgId: " << meta.mMsgId;
std::cerr << std::endl; std::cerr << std::endl;
pit->second.mStatus = VoteHolder::ERROR; pit->second.mStatus = VoteHolder::VOTE_ERROR;
uint32_t status = RsTokenService::GXS_REQUEST_V2_STATUS_FAILED; uint32_t status = RsTokenService::GXS_REQUEST_V2_STATUS_FAILED;
mExchange->updatePublicRequestStatus(pit->second.mReqToken, status); mExchange->updatePublicRequestStatus(pit->second.mReqToken, status);
continue; continue;
@ -554,7 +554,7 @@ void p3GxsCommentService::load_PendingVoteParent(const uint32_t &token)
GxsTokenQueue::queueRequest(vote_token, GXSCOMMENTS_VOTE_DONE); GxsTokenQueue::queueRequest(vote_token, GXSCOMMENTS_VOTE_DONE);
pit->second.mVoteToken = vote_token; pit->second.mVoteToken = vote_token;
pit->second.mStatus = VoteHolder::SUBMITTED; pit->second.mStatus = VoteHolder::VOTE_SUBMITTED;
} }
} }
} }
@ -577,7 +577,7 @@ void p3GxsCommentService::completeInternalVote(uint32_t &token)
std::cerr << "p3GxsChannels::completeInternalVote() Matched to PendingVote. status: " << status; std::cerr << "p3GxsChannels::completeInternalVote() Matched to PendingVote. status: " << status;
std::cerr << std::endl; std::cerr << std::endl;
it->second.mStatus = VoteHolder::READY; it->second.mStatus = VoteHolder::VOTE_READY;
return; return;
} }
} }
@ -603,7 +603,7 @@ bool p3GxsCommentService::acknowledgeVote(const uint32_t& token, RsGxsGrpMsgIdPa
std::cerr << std::endl; std::cerr << std::endl;
bool ans = false; bool ans = false;
if (it->second.mStatus == VoteHolder::READY) if (it->second.mStatus == VoteHolder::VOTE_READY)
{ {
std::cerr << "p3GxsChannels::acknowledgeVote() PendingVote = READY"; std::cerr << "p3GxsChannels::acknowledgeVote() PendingVote = READY";
std::cerr << std::endl; std::cerr << std::endl;
@ -611,7 +611,7 @@ bool p3GxsCommentService::acknowledgeVote(const uint32_t& token, RsGxsGrpMsgIdPa
// Finally finish this Vote off. // Finally finish this Vote off.
ans = mExchange->acknowledgeTokenMsg(it->second.mVoteToken, msgId); ans = mExchange->acknowledgeTokenMsg(it->second.mVoteToken, msgId);
} }
else if (it->second.mStatus == VoteHolder::ERROR) else if (it->second.mStatus == VoteHolder::VOTE_ERROR)
{ {
std::cerr << "p3GxsChannels::acknowledgeVote() PendingVote = ERROR ???"; std::cerr << "p3GxsChannels::acknowledgeVote() PendingVote = ERROR ???";
std::cerr << std::endl; std::cerr << std::endl;

14
libretroshare/src/services/p3gxscommon.h
View File

@ -36,20 +36,20 @@
* provides the implementation for any services requiring Comments. * provides the implementation for any services requiring Comments.
*/ */
#
class VoteHolder class VoteHolder
{ {
public: public:
static const uint32_t ERROR = 0; static const uint32_t VOTE_ERROR = 0;
static const uint32_t QUEUED = 1; static const uint32_t VOTE_QUEUED = 1;
static const uint32_t SUBMITTED = 2; static const uint32_t VOTE_SUBMITTED = 2;
static const uint32_t READY = 3; static const uint32_t VOTE_READY = 3;
VoteHolder() :mVoteToken(0), mReqToken(0), mStatus(ERROR) { return; } VoteHolder() :mVoteToken(0), mReqToken(0), mStatus(VOTE_ERROR) { return; }
VoteHolder(const RsGxsVote &vote, uint32_t reqToken) VoteHolder(const RsGxsVote &vote, uint32_t reqToken)
:mVote(vote), mVoteToken(0), mReqToken(reqToken), mStatus(QUEUED) { return; } :mVote(vote), mVoteToken(0), mReqToken(reqToken), mStatus(VOTE_QUEUED) { return; }
RsGxsVote mVote; RsGxsVote mVote;
uint32_t mVoteToken; uint32_t mVoteToken;

2
retroshare-gui/src/retroshare-gui.pro
View File

@ -1112,6 +1112,7 @@ gxsgui {
gui/gxs/GxsCommentContainer.h \ gui/gxs/GxsCommentContainer.h \
gui/gxs/GxsCommentDialog.h \ gui/gxs/GxsCommentDialog.h \
gui/gxs/GxsCreateCommentDialog.h \ gui/gxs/GxsCreateCommentDialog.h \
gui/gxs/GxsFeedItem.h \
util/TokenQueue.h \ util/TokenQueue.h \
# gui/gxs/GxsMsgDialog.h \ # gui/gxs/GxsMsgDialog.h \
@ -1135,6 +1136,7 @@ gxsgui {
gui/gxs/GxsCommentContainer.cpp \ gui/gxs/GxsCommentContainer.cpp \
gui/gxs/GxsCommentDialog.cpp \ gui/gxs/GxsCommentDialog.cpp \
gui/gxs/GxsCreateCommentDialog.cpp \ gui/gxs/GxsCreateCommentDialog.cpp \
gui/gxs/GxsFeedItem.cpp \
util/TokenQueue.cpp \ util/TokenQueue.cpp \
# gui/gxs/GxsMsgDialog.cpp \ # gui/gxs/GxsMsgDialog.cpp \