Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 14:20:44 -04: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

4
retroshare-gui/src/gui/feeds/ChatMsgItem.h
View file

@ -33,7 +33,7 @@ class ChatMsgItem : public QWidget, private Ui::ChatMsgItem
public:
/** Default Constructor */
ChatMsgItem(FeedHolder *parent, uint32_t feedId, const std::string &peerId, const std::string &message);
ChatMsgItem(FeedHolder *parent, uint32_t feedId, const RsPeerId &peerId, const std::string &message);
void updateItemStatic();
@ -58,7 +58,7 @@ private:
FeedHolder *mParent;
uint32_t mFeedId;
std::string mPeerId;
RsPeerId mPeerId;
};
#endif