From d642fde9d518bf7fcadde8902c27d60c396bc4b8 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 28 May 2023 00:48:10 +0200
Subject: [PATCH] Fixed x86 build

---
 retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp        | 8 ++++----
 retroshare-gui/src/gui/gxsforums/GxsForumModel.h          | 6 +++---
 retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

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<std::pair<time_t,RsGxsMessageId> > RsGxsForumModel::getPostVersions(const RsGxsMessageId& mid) const
+std::vector<std::pair<rstime_t,RsGxsMessageId> > RsGxsForumModel::getPostVersions(const RsGxsMessageId& mid) const
 {
     auto it = mPostVersions.find(mid);
 
     if(it != mPostVersions.end())
         return it->second;
     else
-        return std::vector<std::pair<time_t,RsGxsMessageId> >();
+        return std::vector<std::pair<rstime_t,RsGxsMessageId> >();
 }
 
 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<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > >& post_versions)
+void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<rstime_t,RsGxsMessageId> > >& 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<RsGxsMessageId,std::vector<std::pair<time_t, RsGxsMessageId> > >() ;
+		auto post_versions = new std::map<RsGxsMessageId,std::vector<std::pair<rstime_t, RsGxsMessageId> > >() ;
         std::vector<ForumPostEntry> *vect = new std::vector<ForumPostEntry>();
 		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<std::pair<time_t,RsGxsMessageId> > getPostVersions(const RsGxsMessageId& mid) const;
+	std::vector<std::pair<rstime_t,RsGxsMessageId> > 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<RsMsgMetaData> &msgs_array, std::vector<ForumModelPostEntry>& posts, std::map<RsGxsMessageId, std::vector<std::pair<time_t, RsGxsMessageId> > > &mPostVersions);
-	void setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > >& post_versions);
+	void setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<rstime_t,RsGxsMessageId> > >& post_versions);
 	void initEmptyHierarchy(std::vector<ForumModelPostEntry>& posts);
 
     std::vector<ForumModelPostEntry> mPosts ; // store the list of posts updated from rsForums.
-	std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > > mPostVersions;
+	std::map<RsGxsMessageId,std::vector<std::pair<rstime_t,RsGxsMessageId> > > 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<std::pair<time_t,RsGxsMessageId> > post_versions = mThreadModel->getPostVersions(mOrigThreadId);
+    std::vector<std::pair<rstime_t,RsGxsMessageId> > post_versions = mThreadModel->getPostVersions(mOrigThreadId);
 
 #ifdef DEBUG_FORUMS
     std::cerr << "Looking into existing versions  for post " << mOrigThreadId << ", thread history: " << post_versions.size() << std::endl;