Use correct calling habits for database connections.

src/core/feedsmodel.cpp

@@ -175,7 +175,8 @@ bool FeedsModel::removeItem(const QModelIndex &index) {
 QList<Message> FeedsModel::messagesForFeeds(const QList<FeedsModelFeed*> &feeds) {
   QList<Message> messages;
 
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection(objectName(),
+                                                                  false);
   QSqlQuery query_read_msg(database);
   query_read_msg.setForwardOnly(true);
   query_read_msg.prepare("SELECT title, url, author, date_created, contents "
@@ -317,7 +318,8 @@ void FeedsModel::loadFromDatabase() {
   qDeleteAll(m_rootItem->childItems());
   m_rootItem->clearChildren();
 
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection(objectName(),
+                                                                  false);
   CategoryAssignment categories;
   FeedAssignment feeds;
 
@@ -429,7 +431,8 @@ QList<FeedsModelFeed*> FeedsModel::feedsForIndexes(const QModelIndexList &indexe
 
 bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
                                int read) {
-  QSqlDatabase db_handle = DatabaseFactory::instance()->connection();
+  QSqlDatabase db_handle = DatabaseFactory::instance()->connection(objectName(),
+                                                                   false);
 
   if (!db_handle.transaction()) {
     qWarning("Starting transaction for feeds read change.");
@@ -465,7 +468,8 @@ bool FeedsModel::markFeedsRead(const QList<FeedsModelFeed*> &feeds,
 
 bool FeedsModel::markFeedsDeleted(const QList<FeedsModelFeed *> &feeds,
                                   int deleted) {
-  QSqlDatabase db_handle = DatabaseFactory::instance()->connection();
+  QSqlDatabase db_handle = DatabaseFactory::instance()->connection(objectName(),
+                                                                   false);
 
   if (!db_handle.transaction()) {
     qWarning("Starting transaction for feeds clearing.");

src/core/feedsmodelfeed.cpp

@@ -47,7 +47,8 @@ QString FeedsModelFeed::typeToString(FeedsModelFeed::Type type) {
 }
 
 void FeedsModelFeed::updateCounts(bool including_total_count) {
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelFeed",
+                                                                  false);
   QSqlQuery query_all(database);
   query_all.setForwardOnly(true);
 

src/core/feedsmodelstandardcategory.cpp

@@ -93,7 +93,8 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const {
 
 bool FeedsModelStandardCategory::addItself() {
   // Children are removed, remove this standard category too.
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardCategory",
+                                                                  false);
   QSqlQuery query_add(database);
 
   query_add.setForwardOnly(true);
@@ -137,7 +138,8 @@ bool FeedsModelStandardCategory::removeItself() {
   }
 
   // Children are removed, remove this standard category too.
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardCategory",
+                                                                  false);
   QSqlQuery query_remove(database);
 
   query_remove.setForwardOnly(true);

src/core/feedsmodelstandardfeed.cpp

@@ -163,7 +163,8 @@ void FeedsModelStandardFeed::update() {
 }
 
 bool FeedsModelStandardFeed::removeItself() {
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardFeed",
+                                                                  false);
   QSqlQuery query_remove(database);
 
   query_remove.setForwardOnly(true);
@@ -186,7 +187,8 @@ bool FeedsModelStandardFeed::removeItself() {
 void FeedsModelStandardFeed::updateMessages(const QList<Message> &messages) {
   int feed_id = id(), message_id;
   qint64 message_creation_date;
-  QSqlDatabase database = DatabaseFactory::instance()->connection();
+  QSqlDatabase database = DatabaseFactory::instance()->connection("FeedsModelStandardFeed",
+                                                                  false);
 
   // Prepare queries.
   QSqlQuery query_select(database);

src/core/messagesmodel.cpp

@@ -13,7 +13,8 @@
 
 MessagesModel::MessagesModel(QObject *parent)
   : QSqlTableModel(parent,
-                   DatabaseFactory::instance()->connection()) {
+                   DatabaseFactory::instance()->connection("MessagesModel",
+                                                           false)) {
   setObjectName("MessagesModel");
 
   setupFonts();

src/gui/formmain.cpp

@@ -194,7 +194,7 @@ void FormMain::onAboutToQuit() {
 
   m_ui->m_tabWidget->feedMessageViewer()->quitDownloader();
 
-  DatabaseFactory::instance()->saveMemoryDatabase();
+  //DatabaseFactory::instance()->saveMemoryDatabase();
 
   saveSize();
 }