abstractsqlstorage api cleanup

[quassel.git] / src / core / abstractsqlstorage.h

diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index 6fefb78..9018509 100644 (file)
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -34,21 +34,17 @@ public:
   AbstractSqlStorage(QObject *parent = 0);
   virtual ~AbstractSqlStorage();
 
-  //! Returns the name of the storage backend engine
-  /** \return A virtual equivalent of displayName() */
-  virtual QString engineName() { return ""; }
-  
 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());
@@ -56,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; };
@@ -73,7 +69,6 @@ private:
   int _schemaVersion;
 
   QHash<QPair<QString, int>, QSqlQuery *> _queryCache;
-
 };