Refactor ActivityListModel population mechanisms

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
nextcloud · Jul 26, 2022 · 57a5fc8 · 57a5fc8
1 parent 9cb255f
commit 57a5fc8
Show file tree

Hide file tree

Showing 7 changed files with 405 additions and 304 deletions.
diff --git a/src/gui/fileactivitylistmodel.h b/src/gui/fileactivitylistmodel.h
@@ -29,7 +29,7 @@ class FileActivityListModel : public ActivityListModel
 public slots:
     void load(AccountState *accountState, const int objectId);
 
-protected:
+protected slots:
     void startFetchJob() override;
 
 private:

diff --git a/src/gui/tray/activitydata.cpp b/src/gui/tray/activitydata.cpp
@@ -25,11 +25,21 @@ bool operator<(const Activity &rhs, const Activity &lhs)
     return rhs._dateTime > lhs._dateTime;
 }
 
+bool operator>(const Activity &rhs, const Activity &lhs)
+{
+    return rhs._dateTime < lhs._dateTime;
+}
+
 bool operator==(const Activity &rhs, const Activity &lhs)
 {
     return (rhs._type == lhs._type && rhs._id == lhs._id && rhs._accName == lhs._accName);
 }
 
+bool operator!=(const Activity &rhs, const Activity &lhs)
+{
+    return !(rhs == lhs);
+}
+
 Activity::Identifier Activity::ident() const
 {
     return Identifier(_id, _accName);

diff --git a/src/gui/tray/activitydata.h b/src/gui/tray/activitydata.h
@@ -156,7 +156,9 @@ class Activity
 };
 
 bool operator==(const Activity &rhs, const Activity &lhs);
+bool operator!=(const Activity &rhs, const Activity &lhs);
 bool operator<(const Activity &rhs, const Activity &lhs);
+bool operator>(const Activity &rhs, const Activity &lhs);
 
 /* ==================================================================== */
 /**
@@ -168,6 +170,7 @@ bool operator<(const Activity &rhs, const Activity &lhs);
 using ActivityList = QList<Activity>;
 }
 
+Q_DECLARE_METATYPE(OCC::Activity)
 Q_DECLARE_METATYPE(OCC::Activity::Type)
 Q_DECLARE_METATYPE(OCC::ActivityLink)
 Q_DECLARE_METATYPE(OCC::PreviewData)