From a3849dd64bd5d8bbddbfcc1b98acd2682268fb47 Mon Sep 17 00:00:00 2001 From: martinrotter Date: Fri, 21 Apr 2017 08:26:20 +0200 Subject: [PATCH] Fix compilation. --- src/miscellaneous/feedreader.cpp | 10 +++++----- src/miscellaneous/feedreader.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/miscellaneous/feedreader.cpp b/src/miscellaneous/feedreader.cpp index aeae24e79..9863c9823 100755 --- a/src/miscellaneous/feedreader.cpp +++ b/src/miscellaneous/feedreader.cpp @@ -38,7 +38,7 @@ FeedReader::FeedReader(QObject *parent) : QObject(parent), m_feedServices(QList()), - m_cacheSaveFutureWatcher(QFutureWatcher()), m_autoUpdateTimer(new QTimer(this)), + m_cacheSaveFutureWatcher(new QFutureWatcher(this)), m_autoUpdateTimer(new QTimer(this)), m_feedDownloaderThread(nullptr), m_feedDownloader(nullptr), m_dbCleanerThread(nullptr), m_dbCleaner(nullptr) { m_feedsModel = new FeedsModel(this); @@ -46,7 +46,7 @@ FeedReader::FeedReader(QObject *parent) m_messagesModel = new MessagesModel(this); m_messagesProxyModel = new MessagesProxyModel(m_messagesModel, this); - connect(&m_cacheSaveFutureWatcher, &QFutureWatcher::finished, this, &FeedReader::asyncCacheSaveFinished); + connect(m_cacheSaveFutureWatcher, &QFutureWatcher::finished, this, &FeedReader::asyncCacheSaveFinished); connect(m_autoUpdateTimer, &QTimer::timeout, this, &FeedReader::executeNextAutoUpdate); updateAutoUpdateStatus(); asyncCacheSaveFinished(); @@ -219,7 +219,7 @@ void FeedReader::checkServicesForAsyncOperations() { } void FeedReader::checkServicesForAsyncOperations(bool wait_for_future) { - if (m_cacheSaveFutureWatcher.future().isStarted() || m_cacheSaveFutureWatcher.future().isRunning()) { + if (m_cacheSaveFutureWatcher->future().isStarted() || m_cacheSaveFutureWatcher->future().isRunning()) { qDebug("Previous future is still running or was already started."); @@ -227,7 +227,7 @@ void FeedReader::checkServicesForAsyncOperations(bool wait_for_future) { // we save all cached data (app exit). if (wait_for_future) { qWarning("Waiting for previously started saving of cached service data."); - m_cacheSaveFutureWatcher.future().waitForFinished(); + m_cacheSaveFutureWatcher->future().waitForFinished(); } else { qWarning("Some cached service data are being saved now, so aborting this saving cycle."); @@ -248,7 +248,7 @@ void FeedReader::checkServicesForAsyncOperations(bool wait_for_future) { future.waitForFinished(); } else { - m_cacheSaveFutureWatcher.setFuture(future); + m_cacheSaveFutureWatcher->setFuture(future); } } diff --git a/src/miscellaneous/feedreader.h b/src/miscellaneous/feedreader.h index 6e45bce66..46c0b8413 100755 --- a/src/miscellaneous/feedreader.h +++ b/src/miscellaneous/feedreader.h @@ -94,7 +94,7 @@ class FeedReader : public QObject { MessagesModel *m_messagesModel; MessagesProxyModel *m_messagesProxyModel; - QFutureWatcher m_cacheSaveFutureWatcher; + QFutureWatcher *m_cacheSaveFutureWatcher; // Auto-update stuff. QTimer *m_autoUpdateTimer;