#include <Common/Globals>
#include <Common/iLogger>
#include <Common/iRegistry>
-#include <Common/iEnv>
+#include <Common/iApp>
#include <QtCore>
#include <QtSql/QtSql>
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()));
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);
}