Somewhere a slash was missing ...

diff --git a/src/gui/alarmdialog.cpp b/src/gui/alarmdialog.cpp
index 5b8e3c2321e80fd438ff16828a1ddd49eb71af76..e542cf8af3e13a2b47c6fe6c09d2cbe782d7ad17 100644 (file)
--- a/src/gui/alarmdialog.cpp
+++ b/src/gui/alarmdialog.cpp
@@ -55,7 +55,7 @@ AlarmDialog::AlarmDialog(int argc, char *argv[], QWidget *aParent)
     connect(snoozePB, SIGNAL(clicked()), SLOT(snooze()));
 
     qString databaseFileName;
     connect(snoozePB, SIGNAL(clicked()), SLOT(snooze()));
 
     qString databaseFileName;

-    databaseFileName = QDesktopServices::storageLocation(QDesktopServices::DataLocation + "ConfClerk.sqlite" 
+    databaseFileName = QDesktopServices::storageLocation(QDesktopServices::DataLocation + "/ConfClerk.sqlite" 

     // TODO: check existence
     QSqlDatabase database = QSqlDatabase::addDatabase("QSQLITE");
     database.setDatabaseName(databaseFileName);
     // TODO: check existence
     QSqlDatabase database = QSqlDatabase::addDatabase("QSQLITE");
     database.setDatabaseName(databaseFileName);

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 492c8ab0873b4750362ccec00bdec90e8388fdff..9f0f1e2523faf5a6edbd3e154378cdd7f8c6040e 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -82,7 +82,7 @@ void SqlEngine::initialize()
     QDir dataDir = QDir(dataDirName).absolutePath();
     if(!dataDir.exists())
         dataDir.mkpath(dataDirName);
     QDir dataDir = QDir(dataDirName).absolutePath();
     if(!dataDir.exists())
         dataDir.mkpath(dataDirName);

-    databaseName = dataDirName + "ConfClerk.sqlite";
+    databaseName = dataDirName + "/ConfClerk.sqlite";

     login("QSQLITE",databaseName);
 }
 
     login("QSQLITE",databaseName);
 }
 

diff --git a/src/test/mvc/eventtest.cpp b/src/test/mvc/eventtest.cpp
index 85234ee597a34830b4ffa17d97f63fd30afa3a7a..cfc3923be0783dd32c3811bec589a27fbe2257b2 100644 (file)
--- a/src/test/mvc/eventtest.cpp
+++ b/src/test/mvc/eventtest.cpp
@@ -30,7 +30,7 @@ void EventTest::initTestCase()
 {
     // Connect to the test database. Ask Mr. Pavelka to generate one for you :)
     QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
 {
     // Connect to the test database. Ask Mr. Pavelka to generate one for you :)
     QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");

-    db.setDatabaseName("fosdem-test.sqlite");
+    db.setDatabaseName("ConfClerk-test.sqlite");

     QVERIFY(db.open());
 }
 
     QVERIFY(db.open());
 }