X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=3e8cbb1cc9a24f217e605b0ee12d132d21f51505;hp=8b264f446248f9e4d306f6a6442b16dade5f9e16;hb=4ed404c7a72dd21bb06b003274ae544ab5ca1ad7;hpb=cd99779fe4a4817283882ba65ddb08533d2ce6f2

diff --git a/src/core/storage.h b/src/core/storage.h
index 8b264f44..3e8cbb1c 100644
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -155,10 +155,17 @@ class Storage : public QObject {
      *  \param networkId The network id
      *  \param type      The type of the buffer (StatusBuffer, Channel, etc.)
      *  \param buffer  The buffer name (if empty, the net's status buffer is returned)
-     *  \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found
+     *  \return The BufferInfo corresponding to the given network and buffer name, or an invalid BufferInfo if not found
      */
     virtual BufferInfo getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "") = 0;
 
+    //! Get the unique BufferInfo for a bufferId
+    /** \param user      The core user who owns this buffername
+     *  \param bufferId  The id of the buffer
+     *  \return The BufferInfo corresponding to the given buffer id, or an invalid BufferInfo if not found.
+     */
+    virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId) = 0;
+
     //! Request a list of all buffers known to a user since a certain point in time.
     /** This method is used to get a list of all buffers we have stored a backlog from.
      *  Optionally, a QDateTime can be given, so that only buffers are listed that where active
@@ -176,6 +183,15 @@ class Storage : public QObject {
      *  \return true if successfull
      */
     virtual bool removeBuffer(const UserId &user, const BufferId &bufferId) = 0;
+
+    //! Rename a Buffer
+    /** \param user      The id of the buffer owner
+     *  \param networkId The id of the network the buffer belongs to
+     *  \param newName   The new name of the buffer
+     *  \param oldName   The previous name of the buffer
+     *  \return the BufferId of the affected buffer or an invalid BufferId if not successfull
+     */
+    virtual BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) = 0;
   
     //! Update the LastSeenDate for a Buffer
     /** This Method is used to make the LastSeenDate of a Buffer persistent
@@ -227,6 +243,8 @@ class Storage : public QObject {
   signals:
     //! Sent when a new BufferInfo is created, or an existing one changed somehow.
     void bufferInfoUpdated(UserId user, const BufferInfo &);
+    //! Sent when a Buffer was renamed
+    void bufferRenamed(const QString &newName, const QString &oldName);
     //! Sent when a new user has been added
     void userAdded(UserId, const QString &username);
     //! Sent when a user has been renamed
@@ -234,8 +252,11 @@ class Storage : public QObject {
     //! Sent when a user has been removed
     void userRemoved(UserId);
 
-  public:
-
+  protected:
+    //! when implementing a storage handler, use this method to crypt user passwords.
+    /**  This guarantees compatibility with other storage handlers and allows easy migration
+     */
+    QString cryptedPassword(const QString &password);
 };