X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=6ad80fefe5b8e57210bf221e3b16f8699d473734;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hp=5adae63fa9d4b95693b77a02301e9849ce961258;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae;p=quassel.git

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 5adae63f..6ad80fef 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -79,7 +79,8 @@ public slots:
   virtual QList<BufferInfo> requestBuffers(UserId user);
   virtual QList<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
   virtual bool removeBuffer(const UserId &user, const BufferId &bufferId);
-  virtual BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName);
+  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);