X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=f493721cfe1b216e102777cdc5dec57c6fe15f69;hp=e66563bc636b33381c9b03175c72775506079b0d;hb=a634acadbcf6017474f68a3eaf7cb632660e9e49;hpb=47b574c28983254b6679191f76ddb36fe7da7632

diff --git a/src/core/storage.h b/src/core/storage.h
index e66563bc..f493721c 100644
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -24,7 +24,6 @@
 #include <QtCore>
 #include <QSqlDatabase>
 
-//#include "global.h"
 #include "message.h"
 
 class Storage : public QObject {
@@ -66,41 +65,50 @@ class Storage : public QObject {
      *  \param password The cleartext password for the new user
      *  \return The new user's UserId
      */
-    virtual UserId addUser(QString user, QString password) = 0;
+    virtual UserId addUser(const QString &user, const QString &password) = 0;
 
     //! Update a core user's password.
     /** \param user     The user's id
      *  \param password The user's new password
      */
-    virtual void updateUser(UserId user, QString password) = 0;
+    virtual void updateUser(UserId user, const QString &password) = 0;
 
     //! Rename a user
     /** \param user     The user's id
      *  \param newName  The user's new name
      */
-    virtual void renameUser(UserId user, QString newName) = 0;
+    virtual void renameUser(UserId user, const QString &newName) = 0;
 
     //! Validate a username with a given password.
     /** \param user     The username to validate
      *  \param password The user's alleged password
      *  \return A valid UserId if the password matches the username; 0 else
      */
-    virtual UserId validateUser(QString user, QString password) = 0;
+    virtual UserId validateUser(const QString &user, const QString &password) = 0;
 
     //! Remove a core user from storage.
     /** \param user     The userid to delete
      */
     virtual void delUser(UserId user) = 0;
 
+    /* Network handling */
+
+    //! Get the unique NetworkId of the network for a user.
+    /** \param user    The core user who owns this buffername
+     *  \param network The network name
+     *  \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found
+     */
+    virtual uint getNetworkId(UserId user, const QString &network) = 0;
+
     /* Buffer handling */
 
-    //! Get the unique BufferId for the given combination of network and buffername for a user.
+    //! Get the unique BufferInfo for the given combination of network and buffername for a user.
     /** \param user    The core user who owns this buffername
      *  \param network The network name
      *  \param buffer  The buffer name (if empty, the net's status buffer is returned)
-     *  \return The BufferId 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 0 if not found
      */
-    virtual BufferId getBufferId(UserId user, QString network, QString buffer = "") = 0;
+    virtual BufferInfo getBufferInfo(UserId user, const QString &network, const QString &buffer = "") = 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.
@@ -108,9 +116,9 @@ class Storage : public QObject {
      *  since that point in time.
      *  \param user  The user whose buffers we request
      *  \param since If this is defined, older buffers will be ignored
-     *  \return A list of the BufferIds for all buffers as requested
+     *  \return A list of the BufferInfos for all buffers as requested
      */
-    virtual QList<BufferId> requestBuffers(UserId user, QDateTime since = QDateTime()) = 0;
+    virtual QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime()) = 0;
 
     /* Message handling */
 
@@ -126,7 +134,7 @@ class Storage : public QObject {
      *  \param offset   Do not return (but DO count) messages with MsgId >= offset, if offset >= 0
      *  \return The requested list of messages
      */
-    virtual QList<Message> requestMsgs(BufferId buffer, int lastmsgs = -1, int offset = -1) = 0;
+    virtual QList<Message> requestMsgs(BufferInfo buffer, int lastmsgs = -1, int offset = -1) = 0;
 
     //! Request messages stored in a given buffer since a certain point in time.
     /** \param buffer   The buffer we request messages from
@@ -134,7 +142,7 @@ class Storage : public QObject {
      *  \param offset   Do not return messages with MsgId >= offset, if offset >= 0
      *  \return The requested list of messages
      */
-    virtual QList<Message> requestMsgs(BufferId buffer, QDateTime since, int offset = -1) = 0;
+    virtual QList<Message> requestMsgs(BufferInfo buffer, QDateTime since, int offset = -1) = 0;
 
     //! Request a range of messages stored in a given buffer.
     /** \param buffer   The buffer we request messages from
@@ -142,7 +150,7 @@ class Storage : public QObject {
      *  \param last     Return messages with first <= MsgId <= last
      *  \return The requested list of messages
      */
-    virtual QList<Message> requestMsgRange(BufferId buffer, int first, int last) = 0;
+    virtual QList<Message> requestMsgRange(BufferInfo buffer, int first, int last) = 0;
 
   public slots:
     //! This is just for importing the old file-based backlog */
@@ -153,8 +161,8 @@ class Storage : public QObject {
     virtual void importOldBacklog() = 0;
 
   signals:
-    //! Sent when a new BufferId is created, or an existing one changed somehow.
-    void bufferIdUpdated(BufferId);
+    //! Sent when a new BufferInfo is created, or an existing one changed somehow.
+    void bufferInfoUpdated(BufferInfo);
     //! Sent when a new user has been added
     void userAdded(UserId, const QString &username);
     //! Sent when a user has been renamed