From c5123180ad0aa57fbf5f931163a2cc9f5977da15 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 24 Jul 2010 14:27:50 +0200 Subject: Fix database configuration Remove default database from SheMov. Now open named database in SmModelSingleton and use configured settings. --- smmodelsingleton.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'smmodelsingleton.cpp') diff --git a/smmodelsingleton.cpp b/smmodelsingleton.cpp index 7425aeb..41959a5 100644 --- a/smmodelsingleton.cpp +++ b/smmodelsingleton.cpp @@ -8,6 +8,8 @@ #include #include #include +#include +#include #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; -- cgit v1.2.3-70-g09d2