X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.h;h=489318963105d98c45ea937c7710ca68d0cd0525;hb=2baaaea16e777a1fe961d6cc4d34aa9dd323333e;hp=0ad8eaa014a0061d3e3fd1be54c59e40a5a73b48;hpb=9f9d207ecf28dd5470ecef9d4076a3f447662a20;p=quassel.git

diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h
index 0ad8eaa0..48931896 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  *
@@ -25,10 +25,14 @@
 #include "types.h"
 
 class BufferSyncer : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
 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;
 
@@ -36,24 +40,31 @@ public slots:
   QVariantList initLastSeenMsg() const;
   void initSetLastSeenMsg(const QVariantList &);
 
-  void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId);
-  void requestRemoveBuffer(BufferId buffer);
-  void removeBuffer(BufferId buffer);
-  void renameBuffer(BufferId buffer, QString newName);
+  virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) }
+
+  virtual inline void requestRemoveBuffer(BufferId buffer) { REQUEST(ARG(buffer)) }
+  virtual void removeBuffer(BufferId buffer);
+
+  virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { REQUEST(ARG(buffer), ARG(newName)) }
+  virtual inline void renameBuffer(BufferId buffer, QString newName) { SYNC(ARG(buffer), ARG(newName)) emit bufferRenamed(buffer, newName); }
+
+  virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { emit REQUEST(ARG(buffer1), ARG(buffer2)) }
+  virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
+
+  virtual inline void requestPurgeBufferIds() { REQUEST(NO_ARG); }
 
 signals:
   void lastSeenMsgSet(BufferId buffer, const MsgId &msgId);
-  void setLastSeenMsgRequested(BufferId buffer, const MsgId &msgId);
-  void removeBufferRequested(BufferId buffer);
   void bufferRemoved(BufferId buffer);
   void bufferRenamed(BufferId buffer, QString newName);
+  void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
 
-private slots:
+protected slots:
   bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
+  QList<BufferId> bufferIds() const { return _lastSeenMsg.keys(); }
 
 private:
   QHash<BufferId, MsgId> _lastSeenMsg;
-
 };
 
 #endif