Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-30 04:16:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/feeds/PeerItem.cpp
View file

@ -40,7 +40,7 @@
****/
/** Constructor */
PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, const std::string &peerId, uint32_t type, bool isHome)
PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId, uint32_t type, bool isHome)
:QWidget(NULL), mParent(parent), mFeedId(feedId),
mPeerId(peerId), mType(type), mIsHome(isHome)
{
@ -70,7 +70,7 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, const std::string &peerI
quickmsgButton->setMenu(msgmenu);
avatar->setId(mPeerId, false);
avatar->setId(RsPeerId(mPeerId));
expandFrame->hide();
@ -114,7 +114,7 @@ void PeerItem::updateItemStatic()
titleLabel->setText(title);
RsPeerDetails details;
if (rsPeers->getPeerDetails(mPeerId, details))
if (rsPeers->getPeerDetails(RsPeerId(mPeerId), details))
{
/* set peer name */
peerNameLabel->setText(QString::fromUtf8(details.name.c_str()));
@ -122,7 +122,7 @@ void PeerItem::updateItemStatic()
/* expanded Info */
nameLabel->setText(QString::fromUtf8(details.name.c_str()));
idLabel->setText(QString::fromStdString(details.id));
idLabel->setText(QString::fromStdString(details.id.toStdString()));
locLabel->setText(QString::fromUtf8(details.location.c_str()));
}
else