diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp index 603354c8e..b68a50173 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp @@ -117,14 +117,14 @@ int RsGxsForumModel::columnCount(const QModelIndex &/*parent*/) const return COLUMN_THREAD_NB_COLUMNS ; } -std::vector > RsGxsForumModel::getPostVersions(const RsGxsMessageId& mid) const +std::vector > RsGxsForumModel::getPostVersions(const RsGxsMessageId& mid) const { auto it = mPostVersions.find(mid); if(it != mPostVersions.end()) return it->second; else - return std::vector >(); + return std::vector >(); } bool RsGxsForumModel::getPostData(const QModelIndex& i,ForumModelPostEntry& fmpe) const @@ -746,7 +746,7 @@ void RsGxsForumModel::clear() emit forumLoaded(); } -void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector& posts,const std::map > >& post_versions) +void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector& posts,const std::map > >& post_versions) { preMods(); @@ -812,7 +812,7 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id) // 2 - sort messages into a proper hierarchy - auto post_versions = new std::map > >() ; + auto post_versions = new std::map > >() ; std::vector *vect = new std::vector(); RsGxsForumGroup group = groups[0]; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h index 47eecaabd..c69013c3e 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h +++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h @@ -77,7 +77,7 @@ public: static const QString FilterString ; - std::vector > getPostVersions(const RsGxsMessageId& mid) const; + std::vector > getPostVersions(const RsGxsMessageId& mid) const; // This method will asynchroneously update the data void updateForum(const RsGxsGroupId& forumGroup); @@ -170,11 +170,11 @@ private: static void convertMsgToPostEntry(const RsGxsForumGroup &mForumGroup, const RsMsgMetaData &msg, bool useChildTS, ForumModelPostEntry& fentry); void computeMessagesHierarchy(const RsGxsForumGroup& forum_group, const std::vector &msgs_array, std::vector& posts, std::map > > &mPostVersions); - void setPosts(const RsGxsForumGroup& group, const std::vector& posts,const std::map > >& post_versions); + void setPosts(const RsGxsForumGroup& group, const std::vector& posts,const std::map > >& post_versions); void initEmptyHierarchy(std::vector& posts); std::vector mPosts ; // store the list of posts updated from rsForums. - std::map > > mPostVersions; + std::map > > mPostVersions; QColor mTextColorRead ; QColor mTextColorUnread ; diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index 1309848c2..11d04fdd8 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -1193,7 +1193,7 @@ void GxsForumThreadWidget::insertMessage() // add/show combobox for versions, if applicable, and enable it. If no older versions of the post available, hide the combobox. - std::vector > post_versions = mThreadModel->getPostVersions(mOrigThreadId); + std::vector > post_versions = mThreadModel->getPostVersions(mOrigThreadId); #ifdef DEBUG_FORUMS std::cerr << "Looking into existing versions for post " << mOrigThreadId << ", thread history: " << post_versions.size() << std::endl;