Improve settings.

[dorian] / model / bookdb.cpp

diff --git a/model/bookdb.cpp b/model/bookdb.cpp
index 2e13c80..ce35c7f 100644 (file)
--- a/model/bookdb.cpp
+++ b/model/bookdb.cpp
@@ -1,5 +1,3 @@
-#include <QFileInfo>
-
 #include "bookdb.h"
 #include "platform.h"
 #include "trace.h"
@@ -24,9 +22,9 @@ void BookDb::close()
 
 BookDb::BookDb()
 {
-    Trace t("BookDb::BookDb");
+    TRACE;
     bool shouldCreate = false;
-    QFileInfo info(Platform::dbPath());
+    QFileInfo info(Platform::instance()->dbPath());
     if (!info.exists()) {
         QDir dbDir;
         if (!dbDir.mkpath(info.absolutePath())) {
@@ -35,10 +33,10 @@ BookDb::BookDb()
         shouldCreate = true;
     }
     db = QSqlDatabase::addDatabase("QSQLITE");
-    db.setDatabaseName(QDir::toNativeSeparators(Platform::dbPath()));
+    db.setDatabaseName(QDir::toNativeSeparators(Platform::instance()->dbPath()));
     if (!db.open()) {
-        qCritical() << "Could not open" << Platform::dbPath() << ": Error"
-                << db.lastError().text();
+        qCritical() << "Could not open" << Platform::instance()->dbPath()
+                << ": Error" << db.lastError().text();
     }
     if (shouldCreate) {
         create();
@@ -52,7 +50,7 @@ BookDb::~BookDb()
 
 void BookDb::create()
 {
-    Trace t("BookDb::create");
+    TRACE;
     QSqlQuery query;
     if (!query.exec("create table book "
                     "(name text primary key, content blob)")) {
@@ -63,7 +61,7 @@ void BookDb::create()
 
 QVariantHash BookDb::load(const QString &book)
 {
-    Trace t("BookDb::load");
+    TRACE;
     qDebug() << book;
     QVariantHash ret;
     QByteArray bytes;
@@ -80,15 +78,13 @@ QVariantHash BookDb::load(const QString &book)
         in >> ret;
         break;
     }
-    qDebug() << ret;
     return ret;
 }
 
 void BookDb::save(const QString &book, const QVariantHash &data)
 {
-    Trace t("BookDb::save");
+    TRACE;
     qDebug() << book;
-    qDebug() << data;
     QByteArray bytes;
     QDataStream out(&bytes, QIODevice::WriteOnly);
     out << data;
@@ -102,7 +98,7 @@ void BookDb::save(const QString &book, const QVariantHash &data)
 
 void BookDb::remove(const QString &book)
 {
-    Trace t("BookDb::remove");
+    TRACE;
     qDebug() << book;
     QSqlQuery query("delete from book where name = ?");
     query.bindValue(0, book);
@@ -113,7 +109,7 @@ void BookDb::remove(const QString &book)
 
 QStringList BookDb::books()
 {
-    Trace t("BookDb::books");
+    TRACE;
     QStringList ret;
     QSqlQuery query("select name from book");
     query.setForwardOnly(true);