introducing query merging (per drag & drop). needs a core update

[quassel.git] / src / client / client.h

diff --git a/src/client/client.h b/src/client/client.h
index ac3663d..362b523 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -114,6 +114,7 @@ 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; }
@@ -164,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();