From 16e2df6575e7c90cdf59411e3d5539bfe4e676a5 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sun, 12 Jan 2014 20:22:10 +0100 Subject: [PATCH] Some inlining. --- src/gui/feedmessageviewer.cpp | 4 ---- src/gui/feedmessageviewer.h | 4 +++- src/gui/feedsview.cpp | 9 +++------ src/gui/feedsview.h | 12 +++++++++++- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 9edac021b..442d395e0 100644 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -290,7 +290,3 @@ void FeedMessageViewer::initializeViews() { // Set layout as active. setLayout(central_layout); } - -WebBrowser *FeedMessageViewer::webBrowser() { - return m_messagesBrowser; -} diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h index 68b537690..e664c3689 100644 --- a/src/gui/feedmessageviewer.h +++ b/src/gui/feedmessageviewer.h @@ -24,7 +24,9 @@ class FeedMessageViewer : public TabContent { virtual ~FeedMessageViewer(); // WebBrowser getter from TabContent interface. - WebBrowser *webBrowser(); + inline WebBrowser *webBrowser() { + return m_messagesBrowser; + } // Loads/saves sizes and states of ALL // underlying widgets, this contains primarily diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 925963a31..a55fd8c43 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -170,8 +170,7 @@ void FeedsView::updateCountsOfSelectedFeeds(bool update_total_too) { // Make sure that selected view reloads changed indexes. m_sourceModel->reloadChangedLayout(m_proxyModel->mapListToSource(selectionModel()->selectedRows())); - emit feedCountsChanged(m_sourceModel->countOfUnreadMessages(), - m_sourceModel->countOfAllMessages()); + notifyWithCounts(); } } @@ -183,8 +182,7 @@ void FeedsView::updateCountsOfAllFeeds(bool update_total_too) { // Make sure that all views reloads its data. m_sourceModel->reloadWholeLayout(); - emit feedCountsChanged(m_sourceModel->countOfUnreadMessages(), - m_sourceModel->countOfAllMessages()); + notifyWithCounts(); } void FeedsView::updateCountsOfParticularFeed(FeedsModelFeed *feed, @@ -196,8 +194,7 @@ void FeedsView::updateCountsOfParticularFeed(FeedsModelFeed *feed, m_sourceModel->reloadChangedLayout(QModelIndexList() << index); } - emit feedCountsChanged(m_sourceModel->countOfUnreadMessages(), - m_sourceModel->countOfAllMessages()); + notifyWithCounts(); } void FeedsView::initializeContextMenuCategoriesFeeds() { diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h index c316590ef..b788abee1 100644 --- a/src/gui/feedsview.h +++ b/src/gui/feedsview.h @@ -4,6 +4,7 @@ #include #include "core/messagesmodel.h" +#include "core/feedsmodel.h" // TODO: http://soundguyrob.files.wordpress.com/2011/03/screen-shot-2011-03-01-at-7-45-23-pm.jpg @@ -18,7 +19,6 @@ // jako navigateToMessages(const QList &messages), mrknout // do navigateToMessage -class FeedsModel; class FeedsProxyModel; class FeedsModelFeed; class FeedsModelCategory; @@ -77,6 +77,16 @@ class FeedsView : public QTreeView { // Reloads counts for particular feed. void updateCountsOfParticularFeed(FeedsModelFeed *feed, bool update_total_too = true); + // TODO: pouzit metodu dole pro uvodni zobrazeni + // poctu v trayi + + // Notifies other components about messages + // counts. + void notifyWithCounts() { + emit feedCountsChanged(m_sourceModel->countOfUnreadMessages(), + m_sourceModel->countOfAllMessages()); + } + protected: // Initializes context menus. void initializeContextMenuCategoriesFeeds();