diff options
author | Arno <am@disconnect.de> | 2010-07-24 14:27:50 +0200 |
---|---|---|
committer | Arno <am@disconnect.de> | 2010-07-24 14:27:50 +0200 |
commit | c5123180ad0aa57fbf5f931163a2cc9f5977da15 (patch) | |
tree | 1bc7f3f03060a1fbcb0cce260e91c8c6fff6003b /smmodelsingleton.cpp | |
parent | e0e15dd1e2da1c2ce77e7629d5023b1d02bb237e (diff) | |
download | SheMov-c5123180ad0aa57fbf5f931163a2cc9f5977da15.tar.gz SheMov-c5123180ad0aa57fbf5f931163a2cc9f5977da15.tar.bz2 SheMov-c5123180ad0aa57fbf5f931163a2cc9f5977da15.zip |
Fix database configuration
Remove default database from SheMov. Now open named database in
SmModelSingleton and use configured settings.
Diffstat (limited to 'smmodelsingleton.cpp')
-rw-r--r-- | smmodelsingleton.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/smmodelsingleton.cpp b/smmodelsingleton.cpp index 7425aeb..41959a5 100644 --- a/smmodelsingleton.cpp +++ b/smmodelsingleton.cpp @@ -8,6 +8,8 @@ #include <QSqlDatabase> #include <QAbstractItemModel> #include <QStringList> +#include <QMessageBox> +#include <QSettings> #include "smmodelsingleton.h" #include "seriestreemodel.h" @@ -27,12 +29,15 @@ SmModelSingleton *SmModelSingleton::instance(){ if(!mInstance){ mInstance = new SmModelSingleton; if(!QSqlDatabase::contains("treedb")){ + QSettings s; QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL", "treedb"); - db.setHostName("hadante"); - db.setUserName("shemov"); - db.setPassword("shemov"); - db.setDatabaseName("shemov2"); - db.open(); + db.setHostName(s.value("database/hostname").toString()); + db.setUserName(s.value("database/dbuser").toString()); + db.setPassword(s.value("database/dbpass").toString()); + db.setDatabaseName(s.value("database/dbname").toString()); + if(!db.open()){ + QMessageBox::critical(0, tr("Error"), tr("Could not open database. Please configure it and restart program.")); + } } } return mInstance; |