X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=c8265d133aca0dd89da40c4566a9451442b5fd83;hp=393050b5c4c86a2057e0d69be15884684c109b15;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 393050b5..c8265d13 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -23,7 +23,6 @@
 
 #include <QCryptographicHash>
 
-#include "global.h"
 #include "storage.h"
 
 class QSqlQuery;
@@ -46,22 +45,25 @@ class SqliteStorage : public Storage {
 
     /* User handling */
 
-    virtual UserId addUser(QString user, QString password);
-    virtual void updateUser(UserId user, QString password);
-    virtual UserId validateUser(QString user, QString password);
+    virtual UserId addUser(const QString &user, const QString &password);
+    virtual void updateUser(UserId user, const QString &password);
+    virtual void renameUser(UserId user, const QString &newName);
+    virtual UserId validateUser(const QString &user, const QString &password);
     virtual void delUser(UserId user);
 
-    /* Buffer handling */
+    /* Network handling */
+    virtual uint getNetworkId(UserId user, const QString &network);
 
-    virtual BufferId getBufferId(UserId user, QString network, QString buffer = "");
-    virtual QList<BufferId> requestBuffers(UserId user, QDateTime since = QDateTime());
+    /* Buffer handling */
+    virtual BufferInfo getBufferInfo(UserId user, const QString &network, const QString &buffer = "");
+    virtual QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
 
     /* Message handling */
 
     virtual MsgId logMessage(Message msg);
-    virtual QList<Message> requestMsgs(BufferId buffer, int lastmsgs = -1, int offset = -1);
-    virtual QList<Message> requestMsgs(BufferId buffer, QDateTime since, int offset = -1);
-    virtual QList<Message> requestMsgRange(BufferId buffer, int first, int last);
+    virtual QList<Message> requestMsgs(BufferInfo buffer, int lastmsgs = -1, int offset = -1);
+    virtual QList<Message> requestMsgs(BufferInfo buffer, QDateTime since, int offset = -1);
+    virtual QList<Message> requestMsgRange(BufferInfo buffer, int first, int last);
 
   public slots:
     //! This is just for importing the old file-based backlog */
@@ -72,13 +74,13 @@ class SqliteStorage : public Storage {
     void importOldBacklog();
 
   signals:
-    void bufferIdUpdated(BufferId);
+    void bufferInfoUpdated(BufferInfo);
 
   protected:
 
   private:
     void initDb();
-    void createBuffer(UserId user, QString network, QString buffer);
+    void createBuffer(UserId user, const QString &network, const QString &buffer);
     QSqlQuery *logMessageQuery;
     QSqlQuery *addSenderQuery;
     QSqlQuery *getLastMessageIdQuery;
@@ -89,7 +91,7 @@ class SqliteStorage : public Storage {
     QSqlQuery *requestMsgRangeQuery;
     QSqlQuery *createNetworkQuery;
     QSqlQuery *createBufferQuery;
-    QSqlQuery *getBufferIdQuery;
+    QSqlQuery *getBufferInfoQuery;
 };