merging gxs_phase2 branch

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-06-04 21:00:43 +00:00
parent 1150366913
commit 325fa4f222
116 changed files with 6050 additions and 3596 deletions

View file

@ -42,6 +42,9 @@ public:
RsPostedPost getPost() const;
void setContent(const RsPostedPost& post);
// Make this public so we can sort based on it.
RsPostedPost mPost;
private slots:
void loadComments();
void makeUpVote();
@ -54,13 +57,11 @@ protected:
virtual void loadMessage(const uint32_t &token);
private:
void setup();
uint32_t mType;
bool mSelected;
RsPostedPost mPost;
};