Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-27 10:21:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some new warnings

Browse Source
This commit is contained in:
Phenom 2016-12-31 15:17:51 +01:00
parent 85e6f61f02
commit 41386c64b7
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -758,7 +758,7 @@ int RsGenExchange::createMessage(RsNxsMsg* msg)
} }
} }
int RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, const uint32_t& signFlag, RsTlvSecurityKeySet& grpKeySet) int RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, const uint32_t& /*signFlag*/, RsTlvSecurityKeySet& grpKeySet)
{ {
bool needIdentitySign = false; bool needIdentitySign = false;
bool needPublishSign = false; bool needPublishSign = false;

6
libretroshare/src/services/p3gxsreputation.cc
View File

@ -1347,13 +1347,13 @@ void Reputation::updateReputation()
for(std::map<RsPeerId,RsReputations::Opinion>::const_iterator it(mOpinions.begin());it!=mOpinions.end();++it) for(std::map<RsPeerId,RsReputations::Opinion>::const_iterator it(mOpinions.begin());it!=mOpinions.end();++it)
{ {
if(it->second == RsReputations::OPINION_NEGATIVE) if( it->second == RsReputations::OPINION_NEGATIVE)
++mFriendsNegative ; ++mFriendsNegative ;
if(it->second == RsReputations::OPINION_POSITIVE) if( it->second == RsReputations::OPINION_POSITIVE)
++mFriendsPositive ; ++mFriendsPositive ;
friend_total += it->second - 1; friend_total += it->second - 1 ;
} }
if(mOpinions.empty()) // includes the case of no friends! if(mOpinions.empty()) // includes the case of no friends!

17
retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View File

@ -996,18 +996,17 @@ QString nickname ;
QIcon GxsIdDetails::getReputationIcon(RsReputations::ReputationLevel icon_index,uint32_t min_reputation) QIcon GxsIdDetails::getReputationIcon(RsReputations::ReputationLevel icon_index,uint32_t min_reputation)
{ {
if(icon_index >= min_reputation) if( icon_index >= min_reputation ) return QIcon(REPUTATION_VOID) ;
return QIcon(REPUTATION_VOID);
switch(icon_index) switch(icon_index)
{ {
case RsReputations::REPUTATION_LOCALLY_NEGATIVE: return QIcon(REPUTATION_LOCALLY_NEGATIVE_ICON) ; break ; case RsReputations::REPUTATION_LOCALLY_NEGATIVE: return QIcon(REPUTATION_LOCALLY_NEGATIVE_ICON) ; break ;
case RsReputations::REPUTATION_LOCALLY_POSITIVE: return QIcon(REPUTATION_LOCALLY_POSITIVE_ICON) ; break ; case RsReputations::REPUTATION_LOCALLY_POSITIVE: return QIcon(REPUTATION_LOCALLY_POSITIVE_ICON) ; break ;
case RsReputations::REPUTATION_REMOTELY_POSITIVE: return QIcon(REPUTATION_REMOTELY_POSITIVE_ICON) ; break ; case RsReputations::REPUTATION_REMOTELY_POSITIVE: return QIcon(REPUTATION_REMOTELY_POSITIVE_ICON) ; break ;
case RsReputations::REPUTATION_REMOTELY_NEGATIVE: return QIcon(REPUTATION_REMOTELY_NEGATIVE_ICON) ; break ; case RsReputations::REPUTATION_REMOTELY_NEGATIVE: return QIcon(REPUTATION_REMOTELY_NEGATIVE_ICON) ; break ;
case RsReputations::REPUTATION_NEUTRAL: return QIcon(REPUTATION_NEUTRAL_ICON) ; break ; case RsReputations::REPUTATION_NEUTRAL: return QIcon(REPUTATION_NEUTRAL_ICON) ; break ;
default: default:
std::cerr << "Asked for unidentified icon index " << icon_index << std::endl; std::cerr << "Asked for unidentified icon index " << icon_index << std::endl;
return QIcon(); // dont draw anything return QIcon(); // dont draw anything
} }
} }

20
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -1072,18 +1072,18 @@ QTreeWidgetItem *GxsForumThreadWidget::convertMsgToThreadWidget(const RsGxsForum
// Early check for a message that should be hidden because its author // Early check for a message that should be hidden because its author
// is flagged with a bad reputation // is flagged with a bad reputation
RsIdentityDetails iddetails ; RsIdentityDetails iddetails;
RsReputations::ReputationLevel reputation_level = RsReputations::REPUTATION_NEUTRAL ; RsReputations::ReputationLevel reputation_level = RsReputations::REPUTATION_NEUTRAL;
bool redacted = false ; bool redacted = false;
if(rsIdentity->getIdDetails(msg.mMeta.mAuthorId,iddetails)) if( rsIdentity->getIdDetails(msg.mMeta.mAuthorId,iddetails) )
{ {
reputation_level = iddetails.mReputation.mOverallReputationLevel ; reputation_level = iddetails.mReputation.mOverallReputationLevel;
redacted = (reputation_level == RsReputations::REPUTATION_LOCALLY_NEGATIVE) ; redacted = (reputation_level == RsReputations::REPUTATION_LOCALLY_NEGATIVE);
} }
else else
reputation_level = RsReputations::REPUTATION_UNKNOWN ; reputation_level = RsReputations::REPUTATION_UNKNOWN;
GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(mThreadCompareRole,GxsIdDetails::ICON_TYPE_AVATAR ); GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(mThreadCompareRole,GxsIdDetails::ICON_TYPE_AVATAR );
item->moveToThread(ui->threadTreeWidget->thread()); item->moveToThread(ui->threadTreeWidget->thread());