From addad0af3106c45437ac19246844b1537ae5a5c2 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 12 Nov 2014 18:34:50 +0100 Subject: [PATCH] Some fixes. --- src/core/feedsmodelrecyclebin.cpp | 9 +++------ src/gui/messagesview.cpp | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/core/feedsmodelrecyclebin.cpp b/src/core/feedsmodelrecyclebin.cpp index feff4c259..c0d01bd6e 100644 --- a/src/core/feedsmodelrecyclebin.cpp +++ b/src/core/feedsmodelrecyclebin.cpp @@ -109,8 +109,7 @@ QVariant FeedsModelRecycleBin::data(int column, int role) const { } bool FeedsModelRecycleBin::empty() { - QSqlDatabase db_handle = qApp->database()->connection("FeedsModelRecycleBin", - DatabaseFactory::FromSettings); + QSqlDatabase db_handle = qApp->database()->connection("FeedsModelRecycleBin", DatabaseFactory::FromSettings); if (!db_handle.transaction()) { qWarning("Starting transaction for recycle bin emptying."); @@ -137,8 +136,7 @@ bool FeedsModelRecycleBin::empty() { } bool FeedsModelRecycleBin::restore() { - QSqlDatabase db_handle = qApp->database()->connection("FeedsModelRecycleBin", - DatabaseFactory::FromSettings); + QSqlDatabase db_handle = qApp->database()->connection("FeedsModelRecycleBin", DatabaseFactory::FromSettings); if (!db_handle.transaction()) { qWarning("Starting transaction for recycle bin restoring."); @@ -165,8 +163,7 @@ bool FeedsModelRecycleBin::restore() { } void FeedsModelRecycleBin::updateCounts(bool update_total_count) { - QSqlDatabase database = qApp->database()->connection("FeedsModelRecycleBin", - DatabaseFactory::FromSettings); + QSqlDatabase database = qApp->database()->connection("FeedsModelRecycleBin", DatabaseFactory::FromSettings); QSqlQuery query_all(database); query_all.setForwardOnly(true); diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp index d60563e9d..23b5f05c3 100755 --- a/src/gui/messagesview.cpp +++ b/src/gui/messagesview.cpp @@ -345,10 +345,8 @@ void MessagesView::deleteSelectedMessages() { int row_count = m_sourceModel->rowCount(); if (row_count > 0) { QModelIndex last_item = current_index.row() < row_count ? - m_proxyModel->index(current_index.row(), - MSG_DB_TITLE_INDEX) : - m_proxyModel->index(row_count - 1, - MSG_DB_TITLE_INDEX); + m_proxyModel->index(current_index.row(), MSG_DB_TITLE_INDEX) : + m_proxyModel->index(row_count - 1, MSG_DB_TITLE_INDEX); setCurrentIndex(last_item); scrollTo(last_item);