mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-25 07:29:33 -05:00
Merge pull request #1922 from PhenomRetroShare/Fix_SomeWarnings
Fix some warnings
This commit is contained in:
commit
e6edae27be
@ -90,7 +90,7 @@ void RsMsgTags::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSeri
|
|||||||
if(j == RsGenericSerializer::DESERIALIZE)
|
if(j == RsGenericSerializer::DESERIALIZE)
|
||||||
while(ctx.mOffset < ctx.mSize)
|
while(ctx.mOffset < ctx.mSize)
|
||||||
{
|
{
|
||||||
uint32_t n ;
|
uint32_t n = 0;// No real need to initialize but otherwise the compiler complains.
|
||||||
RsTypeSerializer::serial_process<uint32_t>(j,ctx,n,"tagIds element") ;
|
RsTypeSerializer::serial_process<uint32_t>(j,ctx,n,"tagIds element") ;
|
||||||
tagIds.push_back(n) ;
|
tagIds.push_back(n) ;
|
||||||
}
|
}
|
||||||
|
@ -322,7 +322,7 @@ void IdDetailsDialog::modifyReputation()
|
|||||||
case 2: op = RsOpinion::POSITIVE; break;
|
case 2: op = RsOpinion::POSITIVE; break;
|
||||||
default:
|
default:
|
||||||
std::cerr << "Wrong value from opinion combobox. Bug??" << std::endl;
|
std::cerr << "Wrong value from opinion combobox. Bug??" << std::endl;
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
rsReputations->setOwnOpinion(id,op);
|
rsReputations->setOwnOpinion(id,op);
|
||||||
|
|
||||||
|
@ -681,6 +681,7 @@ QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case ENTRY_TYPE_NODE:
|
case ENTRY_TYPE_NODE:
|
||||||
|
{
|
||||||
const HierarchicalNodeInformation *node = getNodeInfo(e);
|
const HierarchicalNodeInformation *node = getNodeInfo(e);
|
||||||
|
|
||||||
if(!node)
|
if(!node)
|
||||||
@ -710,7 +711,10 @@ QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
|
|||||||
default:
|
default:
|
||||||
return QVariant();
|
return QVariant();
|
||||||
} break;
|
} break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default: //ENTRY_TYPE
|
||||||
return QVariant();
|
return QVariant();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user