X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=6ad80fefe5b8e57210bf221e3b16f8699d473734;hb=06425de049985c2300deec83f3d10bb7a0550c82;hp=9b6d2c7c9a5b39395217344ed09a4fe3dd3d55dd;hpb=7897b8623a42967511e31c68d5c102033a1dcdb9;p=quassel.git

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 9b6d2c7c..6ad80fef 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -80,6 +80,7 @@ public slots:
   virtual QList<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
   virtual bool removeBuffer(const UserId &user, const BufferId &bufferId);
   virtual bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName);
+  virtual bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2);
   virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
   virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);