X-Git-Url: https://vaikene.ee/gitweb/highlight.css?a=blobdiff_plain;f=src%2Fapps%2FPswGen%2FStorage%2Fmodule.cpp;h=b7676abf282f0d1323855a54919a676048619a43;hb=1fe7d2eb7cb9c7e362078791d8e3b9ba4d500e44;hp=ab591b7a20d073fa96b0d474a5b058a15043b0e8;hpb=37ff4c7dcaf312c1fd359bc824ca84de53411101;p=evaf

diff --git a/src/apps/PswGen/Storage/module.cpp b/src/apps/PswGen/Storage/module.cpp
index ab591b7..b7676ab 100644
--- a/src/apps/PswGen/Storage/module.cpp
+++ b/src/apps/PswGen/Storage/module.cpp
@@ -23,7 +23,7 @@
 #include <Common/Globals>
 #include <Common/iLogger>
 #include <Common/iRegistry>
-#include <Common/iEnv>
+#include <Common/iApp>
 
 #include <QtCore>
 #include <QtSql/QtSql>
@@ -102,13 +102,11 @@ StorageImpl::~StorageImpl()
 
 bool StorageImpl::init()
 {
-    EVAF_INFO("%s initialized", qPrintable(objectName()));
-
     // Open the database
     if (!QSqlDatabase::contains(DbConnectionName)) {
         // No database connection yet
         mDb = QSqlDatabase::addDatabase("QSQLITE", DbConnectionName);
-        mDb.setDatabaseName(Common::iEnv::instance()->dataRootDir() + DbName);
+        mDb.setDatabaseName(Common::iApp::instance()->dataRootDir() + DbName);
         if (!mDb.open()) {
             QSqlError err = mDb.lastError();
             EVAF_ERROR("Failed to open database : %s", qPrintable(err.text()));
@@ -131,6 +129,8 @@ bool StorageImpl::init()
     /// Register our interface
     Common::iRegistry::instance()->registerInterface("iStorage", this);
 
+    EVAF_INFO("%s initialized", qPrintable(objectName()));
+
     return true;
 }
 
@@ -150,7 +150,8 @@ bool StorageImpl::save(QString const & name, QExplicitlySharedDataPointer<Storag
         // This is an update
         if (data->modified()) {
             QSqlQuery q(mDb);
-            if (!q.exec(QString("UPDATE data SET length = \'%1\', flags = \'%2\' WHERE name = \'%3\';").arg(data->length()).arg(data->flags()).arg(name))) {
+            if (!q.exec(QString("UPDATE data SET length = \'%1\', flags = \'%2\' WHERE name = \'%3\';")
+                            .arg(data->length()).arg(data->flags()).arg(name))) {
                 QSqlError err = mDb.lastError();
                 EVAF_ERROR("Failed to update \'%s\' : %s", qPrintable(name), qPrintable(err.text()));
                 return false;
@@ -160,7 +161,9 @@ bool StorageImpl::save(QString const & name, QExplicitlySharedDataPointer<Storag
     else {
         // Store to the database
         QSqlQuery q(mDb);
-        if (!q.exec(QString("INSERT INTO data (name, length, flags) VALUES (\'%1\', %2, %3);").arg(name).arg(data->length()).arg(int(data->flags())))) {
+        if (!q.exec(QString("INSERT INTO data (name, length, flags) VALUES (\'%1\', %2, %3);")
+                            .arg(name).arg(data->length())
+                            .arg(int(data->flags())))) {
             QSqlError err = mDb.lastError();
             EVAF_ERROR("Failed to insert \'%s\' : %s", qPrintable(name), qPrintable(err.text()));
             return false;
@@ -231,7 +234,7 @@ bool StorageImpl::loadData()
 
     while (q.next()) {
         QString name = q.value(0).toString();
-        QExplicitlySharedDataPointer<Storage::Data> data(new Storage::Data(q.value(1).toInt(), uint(q.value(2).toInt())));
+        QExplicitlySharedDataPointer<Storage::Data> data(new Storage::Data(name, q.value(1).toInt(), uint(q.value(2).toInt())));
         mData.insert(name, data);
     }