mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-28 08:54:13 -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
|
@ -49,7 +49,7 @@ public:
|
|||
|
||||
// virtual UserNotify *getUserNotify(QObject *parent);
|
||||
|
||||
bool navigate(const std::string& forumId, const std::string& msgId);
|
||||
bool navigate(const RsGxsGroupId forumId, const std::string& msgId);
|
||||
|
||||
// Callback for all Loads.
|
||||
virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
|
||||
|
@ -90,11 +90,11 @@ private slots:
|
|||
private:
|
||||
void insertForums();
|
||||
|
||||
void updateMessageSummaryList(std::string forumId);
|
||||
void updateMessageSummaryList( RsGxsGroupId forumId);
|
||||
// void forumInfoToGroupItemInfo(const ForumInfo &forumInfo, GroupItemInfo &groupItemInfo);
|
||||
void forumInfoToGroupItemInfo(const RsGroupMetaData &forumInfo, GroupItemInfo &groupItemInfo);
|
||||
|
||||
void openForumInNewTab(const std::string &forumId);
|
||||
void openForumInNewTab(const RsGxsGroupId &forumId);
|
||||
void forumSubscribe(bool subscribe);
|
||||
|
||||
void processSettings(bool load);
|
||||
|
@ -108,13 +108,13 @@ private:
|
|||
// subscribe/unsubscribe ack.
|
||||
void acknowledgeSubscribeChange(const uint32_t &token);
|
||||
|
||||
GxsForumThreadWidget *forumThreadWidget(const std::string &forumId);
|
||||
GxsForumThreadWidget *createThreadWidget(const std::string &forumId);
|
||||
GxsForumThreadWidget *forumThreadWidget(const RsGxsGroupId &forumId);
|
||||
GxsForumThreadWidget *createThreadWidget(const RsGxsGroupId &forumId);
|
||||
|
||||
// void requestGroupSummary_CurrentForum(const std::string &forumId);
|
||||
// void requestGroupSummary_CurrentForum(const RsGxsGroupId &forumId);
|
||||
// void loadGroupSummary_CurrentForum(const uint32_t &token);
|
||||
|
||||
std::string mForumId;
|
||||
RsGxsGroupId mForumId;
|
||||
TokenQueue *mForumQueue;
|
||||
GxsForumThreadWidget *mThreadWidget;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue