From 772a871ba7005323b1e495ee8c01c46db20f280b Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 20 Jan 2014 07:41:58 +0100 Subject: [PATCH] Use correct calling habits for database connections. --- src/core/feedsmodel.cpp | 12 ++++++++---- src/core/feedsmodelfeed.cpp | 3 ++- src/core/feedsmodelstandardcategory.cpp | 6 ++++-- src/core/feedsmodelstandardfeed.cpp | 6 ++++-- src/core/messagesmodel.cpp | 3 ++- src/gui/formmain.cpp | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index 1c3d52864..d519b6130 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -175,7 +175,8 @@ bool FeedsModel::removeItem(const QModelIndex &index) { QList FeedsModel::messagesForFeeds(const QList &feeds) { QList 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 FeedsModel::feedsForIndexes(const QModelIndexList &indexe bool FeedsModel::markFeedsRead(const QList &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 &feeds, bool FeedsModel::markFeedsDeleted(const QList &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."); diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp index 0a07c6c74..e7f5a22df 100755 --- a/src/core/feedsmodelfeed.cpp +++ b/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); diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp index 58faff7d2..921ff4313 100755 --- a/src/core/feedsmodelstandardcategory.cpp +++ b/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); diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp index beb8d154e..c8d26e0fe 100755 --- a/src/core/feedsmodelstandardfeed.cpp +++ b/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 &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); diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index ec0d494bb..8f85e6acf 100644 --- a/src/core/messagesmodel.cpp +++ b/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(); diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 11b882310..e2b4449c3 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -194,7 +194,7 @@ void FormMain::onAboutToQuit() { m_ui->m_tabWidget->feedMessageViewer()->quitDownloader(); - DatabaseFactory::instance()->saveMemoryDatabase(); + //DatabaseFactory::instance()->saveMemoryDatabase(); saveSize(); }