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

diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h
index 0ad8eaa0..66e99766 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-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef BUFFERSYNCER_H_
@@ -24,36 +24,65 @@
 #include "syncableobject.h"
 #include "types.h"
 
-class BufferSyncer : public SyncableObject {
-  Q_OBJECT
+class BufferSyncer : public SyncableObject
+{
+    SYNCABLE_OBJECT
+        Q_OBJECT
 
 public:
-  explicit BufferSyncer(QObject *parent);
+    explicit BufferSyncer(QObject *parent);
+    explicit BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, const QHash<BufferId, MsgId> &markerLines, QObject *parent);
 
-  MsgId lastSeenMsg(BufferId buffer) const;
+    inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+
+    MsgId lastSeenMsg(BufferId buffer) const;
+    MsgId markerLine(BufferId buffer) const;
 
 public slots:
-  QVariantList initLastSeenMsg() const;
-  void initSetLastSeenMsg(const QVariantList &);
+    QVariantList initLastSeenMsg() const;
+    void initSetLastSeenMsg(const QVariantList &);
+
+    QVariantList initMarkerLines() const;
+    void initSetMarkerLines(const QVariantList &);
+
+    virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) }
+    virtual inline void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) setMarkerLine(buffer, 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); }
 
-  void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId);
-  void requestRemoveBuffer(BufferId buffer);
-  void removeBuffer(BufferId buffer);
-  void renameBuffer(BufferId buffer, QString 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); }
+
+    virtual inline void requestMarkBufferAsRead(BufferId buffer) { REQUEST(ARG(buffer)) emit bufferMarkedAsRead(buffer); }
+    virtual inline void markBufferAsRead(BufferId buffer) { SYNC(ARG(buffer)) emit bufferMarkedAsRead(buffer); }
 
 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 lastSeenMsgSet(BufferId buffer, const MsgId &msgId);
+    void markerLineSet(BufferId buffer, const MsgId &msgId);
+    void bufferRemoved(BufferId buffer);
+    void bufferRenamed(BufferId buffer, QString newName);
+    void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
+    void bufferMarkedAsRead(BufferId buffer);
 
-private slots:
-  bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
+protected slots:
+    bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
+    bool setMarkerLine(BufferId buffer, const MsgId &msgId);
 
-private:
-  QHash<BufferId, MsgId> _lastSeenMsg;
+protected:
+    inline QList<BufferId> lastSeenBufferIds() const { return _lastSeenMsg.keys(); }
+    inline QList<BufferId> markerLineBufferIds() const { return _markerLines.keys(); }
+    inline QHash<BufferId, MsgId> markerLines() const { return _markerLines; }
 
+private:
+    QHash<BufferId, MsgId> _lastSeenMsg;
+    QHash<BufferId, MsgId> _markerLines;
 };
 
+
 #endif