mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge pull request #616 from PhenomRetroShare/Fix_SomeNewWarnings
Fix some new warnings
This commit is contained in:
commit
6c49b3d026
@ -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 needPublishSign = false;
|
||||
|
@ -1347,13 +1347,13 @@ void Reputation::updateReputation()
|
||||
|
||||
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 ;
|
||||
|
||||
if(it->second == RsReputations::OPINION_POSITIVE)
|
||||
if( it->second == RsReputations::OPINION_POSITIVE)
|
||||
++mFriendsPositive ;
|
||||
|
||||
friend_total += it->second - 1;
|
||||
friend_total += it->second - 1 ;
|
||||
}
|
||||
|
||||
if(mOpinions.empty()) // includes the case of no friends!
|
||||
|
@ -996,18 +996,17 @@ QString nickname ;
|
||||
|
||||
QIcon GxsIdDetails::getReputationIcon(RsReputations::ReputationLevel icon_index,uint32_t min_reputation)
|
||||
{
|
||||
if(icon_index >= min_reputation)
|
||||
return QIcon(REPUTATION_VOID);
|
||||
if( icon_index >= min_reputation ) return QIcon(REPUTATION_VOID) ;
|
||||
|
||||
switch(icon_index)
|
||||
{
|
||||
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_REMOTELY_POSITIVE: return QIcon(REPUTATION_REMOTELY_POSITIVE_ICON) ; break ;
|
||||
case RsReputations::REPUTATION_REMOTELY_NEGATIVE: return QIcon(REPUTATION_REMOTELY_NEGATIVE_ICON) ; break ;
|
||||
case RsReputations::REPUTATION_NEUTRAL: return QIcon(REPUTATION_NEUTRAL_ICON) ; break ;
|
||||
default:
|
||||
std::cerr << "Asked for unidentified icon index " << icon_index << std::endl;
|
||||
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_REMOTELY_POSITIVE: return QIcon(REPUTATION_REMOTELY_POSITIVE_ICON) ; break ;
|
||||
case RsReputations::REPUTATION_REMOTELY_NEGATIVE: return QIcon(REPUTATION_REMOTELY_NEGATIVE_ICON) ; break ;
|
||||
case RsReputations::REPUTATION_NEUTRAL: return QIcon(REPUTATION_NEUTRAL_ICON) ; break ;
|
||||
default:
|
||||
std::cerr << "Asked for unidentified icon index " << icon_index << std::endl;
|
||||
return QIcon(); // dont draw anything
|
||||
}
|
||||
}
|
||||
|
@ -1072,18 +1072,18 @@ QTreeWidgetItem *GxsForumThreadWidget::convertMsgToThreadWidget(const RsGxsForum
|
||||
// Early check for a message that should be hidden because its author
|
||||
// is flagged with a bad reputation
|
||||
|
||||
RsIdentityDetails iddetails ;
|
||||
RsIdentityDetails iddetails;
|
||||
|
||||
RsReputations::ReputationLevel reputation_level = RsReputations::REPUTATION_NEUTRAL ;
|
||||
bool redacted = false ;
|
||||
RsReputations::ReputationLevel reputation_level = RsReputations::REPUTATION_NEUTRAL;
|
||||
bool redacted = false;
|
||||
|
||||
if(rsIdentity->getIdDetails(msg.mMeta.mAuthorId,iddetails))
|
||||
{
|
||||
reputation_level = iddetails.mReputation.mOverallReputationLevel ;
|
||||
redacted = (reputation_level == RsReputations::REPUTATION_LOCALLY_NEGATIVE) ;
|
||||
}
|
||||
else
|
||||
reputation_level = RsReputations::REPUTATION_UNKNOWN ;
|
||||
if( rsIdentity->getIdDetails(msg.mMeta.mAuthorId,iddetails) )
|
||||
{
|
||||
reputation_level = iddetails.mReputation.mOverallReputationLevel;
|
||||
redacted = (reputation_level == RsReputations::REPUTATION_LOCALLY_NEGATIVE);
|
||||
}
|
||||
else
|
||||
reputation_level = RsReputations::REPUTATION_UNKNOWN;
|
||||
|
||||
GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(mThreadCompareRole,GxsIdDetails::ICON_TYPE_AVATAR );
|
||||
item->moveToThread(ui->threadTreeWidget->thread());
|
||||
|
Loading…
Reference in New Issue
Block a user