[mythtv] [patch] dbsettings.cpp

[Daniel Staaf]

/ Daniel
Index: libs/libmyth/dbsettings.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmyth/dbsettings.cpp,v
retrieving revision 1.1
diff -u -r1.1 dbsettings.cpp
--- libs/libmyth/dbsettings.cpp	8 Dec 2004 03:09:17 -0000	1.1
+++ libs/libmyth/dbsettings.cpp	1 Mar 2005 16:47:41 -0000
@@ -42,8 +42,8 @@
 public:
     MythDbSettings1();
     
-    void load(QSqlDatabase* db);
-    void save(QSqlDatabase* db);
+    void load();
+    void save();
     
 protected:
     TransientLabel    *info;
@@ -58,8 +58,8 @@
 public:
     MythDbSettings2();
     
-    void load(QSqlDatabase* db);
-    void save(QSqlDatabase* db);
+    void load();
+    void save();
     
 protected:
     TransientCheckBox *localEnabled;
@@ -113,15 +113,8 @@
     setUseLabel(false);
     
     info = new TransientLabel();
-    QSqlDatabase *db = QSqlDatabase::database(QSqlDatabase::defaultConnection,
-                                              false);
-    if (db && db->isOpen())
-        info->setValue(QObject::tr("All database settings take effect when "
-                                   "you restart this program."));
-    else
-        info->setValue(QObject::tr("Myth could not connect to the database. "
-                                   "Please verify your database settings "
-                                   "below."));
+    info->setValue(QObject::tr("All database settings take effect when "
+                               "you restart this program."));
     addChild(info);
     
     dbHostName = new TransientLineEdit(true);
@@ -231,10 +224,8 @@
     addChild(sub4);
 }
 
-void MythDbSettings1::load(QSqlDatabase* db)
+void MythDbSettings1::load()
 {
-    (void)db;
-    
     DatabaseParams params = gContext->GetDatabaseParams();
     
     if (params.dbHostName.isEmpty() ||
@@ -263,10 +254,8 @@
         dbType->setValue(1);
 }
 
-void MythDbSettings2::load(QSqlDatabase* db)
+void MythDbSettings2::load()
 {
-    (void)db;
-    
     DatabaseParams params = gContext->GetDatabaseParams();
     
     localEnabled->setValue(params.localEnabled);
@@ -278,9 +267,8 @@
     wolCommand->setValue(params.wolCommand);
 }
 
-void MythDbSettings1::save(QSqlDatabase* db)
+void MythDbSettings1::save()
 {
-    (void)db;
     DatabaseParams params = gContext->GetDatabaseParams();
     
     params.dbHostName    = dbHostName->getValue();
@@ -292,9 +280,8 @@
     gContext->SaveDatabaseParams(params);
 }
 
-void MythDbSettings2::save(QSqlDatabase* db)
+void MythDbSettings2::save()
 {
-    (void)db;
     DatabaseParams params = gContext->GetDatabaseParams();
     
     params.localEnabled  = localEnabled->boolValue();
_______________________________________________
mythtv-dev mailing list
mythtv-dev@mythtv.org
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev