Do not store DB connection settings in MyList

Use the settings in Database directly.

diff --git a/localmylist/mylist.cpp b/localmylist/mylist.cpp
index 64a6e2df328b16e3a11ae2181f23a6d8138aa22f..ef13cf10b8f333d3f7eb18134770ffe4d70ec005 100644 (file)
--- a/localmylist/mylist.cpp
+++ b/localmylist/mylist.cpp
@@ -261,7 +261,7 @@ void MyList::setupWorkThread()
 {
        if (workThread)
                return;
-       workThread = new WorkThread("workThread", dbs, this);
+       workThread = new WorkThread("workThread", db->connectionSettings(), this);
        connect(workThread, SIGNAL(finished()), workThread, SLOT(deleteLater()));
        connect(database(), SIGNAL(reconnected()), workThread->database(), SLOT(reconnect()), Qt::QueuedConnection);
        workThread->start();
@@ -284,6 +284,7 @@ void MyList::loadLocalSettings(QSettings &s)
        s.beginGroup("host");
                hostInfo.name = s.value("hostName", QHostInfo::localHostName().toLower()).toString();
        s.endGroup();
+       DatabaseConnectionSettings dbs;
        s.beginGroup("database");
                dbs.host = s.value("host", "localhost").toString();
                dbs.port = quint16(s.value("port", 0).toUInt());
@@ -306,6 +307,7 @@ void MyList::saveLocalSettings()
        s.beginGroup("host");
                s.setValue("hostName", hostInfo.name);
        s.endGroup();
+       const auto &dbs = db->connectionSettings();
        s.beginGroup("database");
                s.setValue("host", dbs.host);
                s.setValue("port", dbs.port);

diff --git a/localmylist/mylist.h b/localmylist/mylist.h
index 1641b4412e05b9aab8a8f2f34a0655c8cc55f601..de3413925db3abaa7dcd3d86b3f725a82393a8a8 100644 (file)
--- a/localmylist/mylist.h
+++ b/localmylist/mylist.h
@@ -104,7 +104,6 @@ signals:
        void debugMessage(const QString &message);
 
 private:
-       DatabaseConnectionSettings dbs;
        Database *db;
        WorkThread *workThread;
        ServiceManager *m_serviceManager;