mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-22 06:09:09 -04:00
merge of branch v0.6-idclean 7180
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
7815efb16f
commit
0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue