X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;f=src%2Fapps%2FPswGen%2FStorage%2Fmodule.cpp;h=b062b305453975aaef87fee517f455a9efe6d6c0;hb=8d44aa97324c1fb3e5d36d03d5d6b7386cbb589e;hp=b0fd6afed017eefccd102ab98a2f96e11c96f5db;hpb=4a856bc600d1819e01c797881e0591810737c2fd;p=evaf

diff --git a/src/apps/PswGen/Storage/module.cpp b/src/apps/PswGen/Storage/module.cpp
index b0fd6af..b062b30 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>
@@ -108,7 +108,7 @@ bool StorageImpl::init()
     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()));
@@ -160,7 +160,7 @@ 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 +231,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);
     }