From f55c9bad56da5c1c660772d2134b430aae235bdc Mon Sep 17 00:00:00 2001 From: martinrotter Date: Tue, 7 Mar 2017 09:21:53 +0100 Subject: [PATCH] Fix some compilation issues. --- src/gui/feedmessageviewer.cpp | 7 +++++++ src/network-web/googlesuggest.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 0861ebcbd..89c9ae178 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -213,10 +213,17 @@ void FeedMessageViewer::createConnections() { connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &MessagePreviewer::clear); connect(m_messagesView, &MessagesView::currentMessageChanged, m_messagesBrowser, &MessagePreviewer::loadMessage); +#if defined(USE_WEBENGINE) + connect(m_messagesBrowser, &WebBrowser::markMessageRead, + m_messagesView->sourceModel(), &MessagesModel::setMessageReadById); + connect(m_messagesBrowser, &WebBrowser::markMessageImportant, + m_messagesView->sourceModel(), &MessagesModel::setMessageImportantById); +#else connect(m_messagesBrowser, &MessagePreviewer::markMessageRead, m_messagesView->sourceModel(), &MessagesModel::setMessageReadById); connect(m_messagesBrowser, &MessagePreviewer::markMessageImportant, m_messagesView->sourceModel(), &MessagesModel::setMessageImportantById); +#endif // If user selects feeds, load their messages. connect(m_feedsView, &FeedsView::itemSelected, m_messagesView, &MessagesView::loadItem); diff --git a/src/network-web/googlesuggest.cpp b/src/network-web/googlesuggest.cpp index 6b0e8a754..0ebbef6ba 100755 --- a/src/network-web/googlesuggest.cpp +++ b/src/network-web/googlesuggest.cpp @@ -76,7 +76,7 @@ GoogleSuggest::GoogleSuggest(LocationLineEdit *editor, QObject *parent) connect(popup.data(), &QListWidget::itemClicked, this, &GoogleSuggest::doneCompletion); connect(timer, &QTimer::timeout, this, &GoogleSuggest::autoSuggest); - connect(editor, &LocationLineEdit::textEdited, timer, &QTimer::start); + connect(editor, &LocationLineEdit::textEdited, timer, static_cast(&QTimer::start)); } GoogleSuggest::~GoogleSuggest() {