Make tools connect to the database since MyList does not do it automatically anymore.

diff --git a/import-mylist/main.cpp b/import-mylist/main.cpp
index 5485df9..fc43441 100644 (file)
--- a/import-mylist/main.cpp
+++ b/import-mylist/main.cpp
@@ -18,10 +18,10 @@ int main(int argc, char *argv[])
                return 1;
        }
 
-       QFile f(a.arguments()[1]);
-       if (!f.open(QIODevice::ReadOnly))
+       LocalMyList::instance()->loadLocalSettings();
+       if (!LocalMyList::instance()->database()->connect())
        {
-               cout << "Failed open file for reading";
+               cout << "Could not connect to database.";
                return 1;
        }
 

diff --git a/import-titles/main.cpp b/import-titles/main.cpp
index 2316911..eee5d95 100644 (file)
--- a/import-titles/main.cpp
+++ b/import-titles/main.cpp
@@ -17,6 +17,13 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       LocalMyList::instance()->loadLocalSettings();
+       if (!LocalMyList::instance()->database()->connect())
+       {
+               cout << "Could not connect to database.";
+               return 1;
+       }
+
        AbstractTask *t = LocalMyList::instance()->importTitles(a.arguments()[1]);
        QObject::connect(t, SIGNAL(finished()), &a, SLOT(quit()));
 

diff --git a/play-next/main.cpp b/play-next/main.cpp
index ea73e1f..3d98f80 100644 (file)
--- a/play-next/main.cpp
+++ b/play-next/main.cpp
@@ -22,6 +22,13 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       LocalMyList::instance()->loadLocalSettings();
+       if (!LocalMyList::instance()->database()->connect())
+       {
+               cout << "Could not connect to database.";
+               return 1;
+       }
+
        QStringList args = a.arguments();
        args.removeFirst();
 

diff --git a/search-gui/mainwindow.cpp b/search-gui/mainwindow.cpp
index 25d8740..7445415 100644 (file)
--- a/search-gui/mainwindow.cpp
+++ b/search-gui/mainwindow.cpp
@@ -15,7 +15,8 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
        ui->setupUi(this);
-       MyList::instance();
+       MyList::instance()->loadLocalSettings();
+       MyList::instance()->database()->connect();
 
        model = new QSqlQueryModel(this);