- static inline BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
- return instance()->storage->renameBuffer(user, networkId, newName, oldName);
+ static inline bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) {
+ return instance()->storage->renameBuffer(user, bufferId, newName);
+ }
+
+ //! Merge the content of two Buffers permanently. This cannot be reversed!
+ /** \note This method is threadsafe.
+ * \param user The id of the buffer owner
+ * \param bufferId1 The bufferId of the remaining buffer
+ * \param bufferId2 The buffer that is about to be removed
+ * \return true if successfulln
+ */
+ static inline bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) {
+ return instance()->storage->mergeBuffersPermanently(user, bufferId1, bufferId2);