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:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions

View file

@ -25,7 +25,7 @@ class GxsForumThreadWidget : public RsGxsUpdateBroadcastWidget, public TokenResp
Q_PROPERTY(QColor textColorMissing READ textColorMissing WRITE setTextColorMissing)
public:
explicit GxsForumThreadWidget(const std::string &forumId, QWidget *parent = NULL);
explicit GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget *parent = NULL);
~GxsForumThreadWidget();
QColor textColorRead() const { return mTextColorRead; }
@ -40,15 +40,15 @@ public:
void setTextColorNotSubscribed(QColor color) { mTextColorNotSubscribed = color; }
void setTextColorMissing(QColor color) { mTextColorMissing = color; }
std::string forumId() { return mForumId; }
void setForumId(const std::string &forumId);
RsGxsGroupId forumId() { return mForumId; }
void setForumId(const RsGxsGroupId &forumId);
QString forumName(bool withUnreadCount);
QIcon forumIcon();
unsigned int newCount() { return mNewCount; }
unsigned int unreadCount() { return mUnreadCount; }
QTreeWidgetItem *convertMsgToThreadWidget(const RsGxsForumMsg &msg, bool useChildTS, uint32_t filterColumn);
QTreeWidgetItem *generateMissingItem(const std::string &msgId);
QTreeWidgetItem *generateMissingItem(const RsGxsMessageId &msgId);
void setAllMsgReadStatus(bool read);
@ -129,9 +129,9 @@ private:
void processSettings(bool bLoad);
std::string mForumId;
std::string mLastForumID;
std::string mThreadId;
RsGxsGroupId mForumId;
RsGxsGroupId mLastForumID;
RsGxsMessageId mThreadId;
QString mForumDescription;
int mSubscribeFlags;
bool mInProcessSettings;
@ -143,7 +143,7 @@ private:
unsigned int mUnreadCount;
unsigned int mNewCount;
void requestGroupSummary_CurrentForum(const std::string &forumId);
void requestGroupSummary_CurrentForum(const RsGxsGroupId &forumId);
void loadGroupSummary_CurrentForum(const uint32_t &token);
void requestMsgData_InsertPost(const RsGxsGrpMsgIdPair &msgId);