X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fabstractsqlstorage.h;h=901850916fa422948f0550813a12803bde435a68;hp=a85fdbbf7307c7c70f199e0ac44550145836f892;hb=cfa01e5ffc7988e7976b8dc0777dabf26b0eacc5;hpb=0c9cd0eef379e1d3e10a75cc8506a7e65f95fd67

diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index a85fdbbf..90185091 100644
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -35,16 +35,16 @@ public:
   virtual ~AbstractSqlStorage();
 
 protected:
-  bool init(const QVariantMap &settings = QVariantMap());
+  virtual bool init(const QVariantMap &settings = QVariantMap());
   virtual void sync();
   
   QSqlDatabase logDb();
   
   QString queryString(const QString &queryName, int version);
-  QString queryString(const QString &queryName);
+  inline QString queryString(const QString &queryName) { return queryString(queryName, 0); }
 
-  QSqlQuery *cachedQuery(const QString &queryName, int version);
-  QSqlQuery *cachedQuery(const QString &queryName);
+  QSqlQuery &cachedQuery(const QString &queryName, int version);
+  inline QSqlQuery &cachedQuery(const QString &queryName) { return cachedQuery(queryName, 0); }
 
   QStringList setupQueries();
   bool setup(const QVariantMap &settings = QVariantMap());
@@ -52,7 +52,7 @@ protected:
   QStringList upgradeQueries(int ver);
   bool upgradeDb();
 
-  bool watchQuery(QSqlQuery *query);
+  bool watchQuery(QSqlQuery &query);
   
   int schemaVersion();
   virtual int installedSchemaVersion() { return -1; };
@@ -69,7 +69,6 @@ private:
   int _schemaVersion;
 
   QHash<QPair<QString, int>, QSqlQuery *> _queryCache;
-
 };