Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-24 23:15:41 -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

10
retroshare-gui/src/gui/common/AvatarWidget.h
View file

@ -24,6 +24,7 @@
#include <QLabel>
#include <stdint.h>
#include <retroshare/rstypes.h>
namespace Ui {
class AvatarWidget;
@ -47,8 +48,8 @@ public:
QString frameState();
void setFrameType(FrameType type);
void setId(const std::string& id, bool isGpg);
void setOwnId();
void setId(const RsPeerId &id) ;
void setOwnId();
void setDefaultAvatar(const QString &avatar);
protected:
@ -65,10 +66,11 @@ private:
QString defaultAvatar;
Ui::AvatarWidget *ui;
std::string mId;
RsPeerId mId;
struct {
bool isOwnId : 1;
bool isGpg : 1;
// bool isGpg : 1;
} mFlag;
FrameType mFrameType;
uint32_t mPeerState;