X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.h;h=33321d53d1c1ab88f32e38767e72dfdd3387a718;hb=946e79e0243dda74433016060f12abc65883f243;hp=c7c975d81570e0dadd4bbf760be97d1802f26f9a;hpb=af456476e906a564d9faf3381b8bc3111fdb2bbd;p=quassel.git

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index c7c975d8..33321d53 100644
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.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  *
@@ -72,6 +72,7 @@ public:
 public slots:
   void requestBacklog(BufferId bufferId);
   void messagesReceived(BufferId bufferId, int count);
+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 protected:
   virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
@@ -111,6 +112,7 @@ public:
   inline const QDateTime &timeStamp() const { return _timestamp; }
   inline MsgId msgId() const { return _msgId; }
   inline BufferId bufferId() const { return _bufferId; }
+  inline void setBufferId(BufferId bufferId) { _bufferId = bufferId; }
   inline Message::Type msgType() const { return _type; }
   inline Message::Flags msgFlags() const { return _flags; }