X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.h;h=f847093dcef12a11a8d5c05bdcff7768b5fd4abe;hp=aa64118b90c56679d916115bfa315ba320003da4;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=bd1a18355495899b5ce3003599a67e1ea7ca01cc

diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h
index aa64118b..f847093d 100644
--- a/src/common/buffersyncer.h
+++ b/src/common/buffersyncer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,40 +21,53 @@
 #ifndef BUFFERSYNCER_H_
 #define BUFFERSYNCER_H_
 
-#include <QDateTime>
-
 #include "syncableobject.h"
 #include "types.h"
 
 class BufferSyncer : public SyncableObject {
   Q_OBJECT
 
-  public:
-    explicit BufferSyncer(QObject *parent);
+public:
+  explicit BufferSyncer(QObject *parent);
+  explicit BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, QObject *parent);
+
+  inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+
+  MsgId lastSeenMsg(BufferId buffer) const;
+
+public slots:
+  QVariantList initLastSeenMsg() const;
+  void initSetLastSeenMsg(const QVariantList &);
+
+  virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { emit setLastSeenMsgRequested(buffer, msgId); }
+
+  virtual inline void requestRemoveBuffer(BufferId buffer) { emit removeBufferRequested(buffer); }
+  virtual void removeBuffer(BufferId buffer);
+
+  virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { emit renameBufferRequested(buffer, newName); }
+  virtual inline void renameBuffer(BufferId buffer, QString newName) { emit bufferRenamed(buffer, newName); }
+
+  virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { emit mergeBuffersPermanentlyRequested(buffer1, buffer2); }
+  virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
 
-    QDateTime lastSeen(BufferId buffer) const;
+signals:
+  void lastSeenMsgSet(BufferId buffer, const MsgId &msgId);
+  void setLastSeenMsgRequested(BufferId buffer, const MsgId &msgId);
 
-  public slots:
-    QVariantList initLastSeen() const;
-    void initSetLastSeen(const QVariantList &);
+  void removeBufferRequested(BufferId buffer);
+  void bufferRemoved(BufferId buffer);
 
-    void requestSetLastSeen(BufferId buffer, const QDateTime &time);
-    void requestRemoveBuffer(BufferId buffer);
-    void removeBuffer(BufferId buffer);
-    void renameBuffer(BufferId buffer, QString newName);
+  void renameBufferRequested(BufferId buffer, QString newName);
+  void bufferRenamed(BufferId buffer, QString newName);
 
-  signals:
-    void lastSeenSet(BufferId buffer, const QDateTime &time);
-    void setLastSeenRequested(BufferId buffer, const QDateTime &time);
-    void removeBufferRequested(BufferId buffer);
-    void bufferRemoved(BufferId buffer);
-    void bufferRenamed(BufferId buffer, QString newName);
+  void mergeBuffersPermanentlyRequested(BufferId buffer1, BufferId buffer2);
+  void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
 
-  private slots:
-    bool setLastSeen(BufferId buffer, const QDateTime &time);
+protected slots:
+  bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
 
-  private:
-    QMap<BufferId, QDateTime> _lastSeen;
+private:
+  QHash<BufferId, MsgId> _lastSeenMsg;
 };
 
 #endif