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 5485df9656f4a12079368175c8e7ee1afcf3593f..fc434412f84231c97a2e7dc9ead573367c86130d 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 23169115a3cbe5bf9a7752cc362f6f6a3e55d186..eee5d95bb566a24f318da8355260c9ab9ddc23e4 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 ea73e1fd5f83ae209beeb2f85d75e52f394873cb..3d98f806e34e3c23726df8ed5e2a81e4f7198503 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 25d8740f94a7f7603d57cb53a6a1ef360f0a55ad..744541564a89758d42b19f5a7b32db2f4973ab0d 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);