X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fstorage.h;fp=core%2Fstorage.h;h=31b2b09ec02ae38cab05d98e8a2fe891a3158bf0;hp=c56cd4e789934f98b7348227337cd27822c797db;hb=88dd38b5ab9a2f24ab4c5ca7825c963fee21267c;hpb=1a320a5613e1108a6b1e32c09a45f5a37f144ba8 diff --git a/core/storage.h b/core/storage.h index c56cd4e7..31b2b09e 100644 --- a/core/storage.h +++ b/core/storage.h @@ -22,6 +22,7 @@ #define _STORAGE_H_ #include +#include #include "global.h" #include "message.h" @@ -68,10 +69,10 @@ class Storage : public QObject { virtual UserId addUser(QString user, QString password) = 0; //! Update a core user's password. - /** \param user The user's name + /** \param user The user's id * \param password The user's new password */ - virtual void updateUser(QString user, QString password) = 0; + virtual void updateUser(UserId user, QString password) = 0; //! Validate a username with a given password. /** \param user The username to validate @@ -81,9 +82,9 @@ class Storage : public QObject { virtual UserId validateUser(QString user, QString password) = 0; //! Remove a core user from storage. - /** \param user The username to delete + /** \param user The userid to delete */ - virtual void delUser(QString user) = 0; + virtual void delUser(UserId user) = 0; /* Buffer handling */ @@ -109,7 +110,7 @@ class Storage : public QObject { //! Store a Message in the backlog. /** \param msg The message object to be stored - * \return The globally uniqe id for the stored message + * \return The globally unique id for the stored message */ virtual MsgId logMessage(Message msg) = 0; @@ -149,10 +150,13 @@ class Storage : public QObject { //! Sent if a new BufferId is created, or an existing one changed somehow. void bufferIdUpdated(BufferId); + protected: // Old stuff, just for importing old file-based data void initBackLogOld(UserId id); + QSqlDatabase logDb; + bool backLogEnabledOld; QDir backLogDir; QHash > backLog;