X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=9df9be340a328ede5e9ffc6df48263f97f168e27;hp=597ca23e80138072b1201b11cbbe241aebcb7b35;hb=26b9300ccab24e526a9f43bef95a2a70f59161df;hpb=997a62b68d7469a93f373476dd955c44eb051be0

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 597ca23e..9df9be34 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -49,6 +49,7 @@ public slots:
   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 UserId internalUser();
   virtual void delUser(UserId user);
   virtual void setUserSetting(UserId userId, const QString &settingName, const QVariant &data);
   virtual QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant());
@@ -71,6 +72,7 @@ public slots:
   virtual BufferInfo getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "");
   virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId);
   virtual QList<BufferInfo> requestBuffers(UserId user);
+  virtual QList<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
   virtual bool removeBuffer(const UserId &user, const BufferId &bufferId);
   virtual BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName);
   virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
@@ -79,7 +81,7 @@ public slots:
   /* Message handling */
   
   virtual MsgId logMessage(Message msg);
-  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, int lastmsgs = -1, int offset = -1);
+  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, int limit = -1, int offset = -1);
   virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, QDateTime since, int offset = -1);
   virtual QList<Message> requestMsgRange(UserId user, BufferId bufferId, int first, int last);
 
@@ -87,8 +89,7 @@ protected:
   inline virtual QString driverName() { return "QSQLITE"; }
   inline virtual QString databaseName() { return backlogFile(); }
   virtual int installedSchemaVersion();
-
-  virtual bool init(const QVariantMap &settings = QVariantMap()); // only needed for migration
+  bool safeExec(QSqlQuery &query, int retryCount = 0);
   
 private:
   static QString backlogFile();
@@ -96,6 +97,8 @@ private:
   bool isValidBuffer(const UserId &user, const BufferId &bufferId);
   NetworkId getNetworkId(UserId user, const QString &network);
   void createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer);
+
+  static int _maxRetryCount;
 };
 
 #endif