X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=362b523348dfeaf4d57317bb406fa46f46adc959;hb=891c87b4e52022480f2ab71b598bfde721815df5;hp=610e732fa399a0fe4ff77839671901a1e61c22db;hpb=ac21cc48d22f0cf58a98b74754fa94564a8e3f45;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index 610e732f..362b5233 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -113,6 +113,8 @@ public:
 
   static void setBufferLastSeenMsg(BufferId id, const MsgId &msgId); // this is synced to core and other clients
   static void removeBuffer(BufferId id);
+  static void renameBuffer(BufferId bufferId, const QString &newName);
+  static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2);
 
   static void logMessage(QtMsgType type, const char *msg);
   static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
@@ -163,6 +165,7 @@ public slots:
 
   void bufferRemoved(BufferId bufferId);
   void bufferRenamed(BufferId bufferId, const QString &newName);
+  void buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2);
 
 private slots:
   void disconnectedFromCore();