FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation.

Browse Source
This commit is contained in:
martinrotter 2017-04-21 08:26:20 +02:00
parent 5edac574e9
commit a3849dd64b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/miscellaneous/feedreader.cpp
View File

@ -38,7 +38,7 @@
FeedReader::FeedReader(QObject *parent) FeedReader::FeedReader(QObject *parent)
: QObject(parent), m_feedServices(QList<ServiceEntryPoint*>()), : QObject(parent), m_feedServices(QList<ServiceEntryPoint*>()),
m_cacheSaveFutureWatcher(QFutureWatcher<void>()), m_autoUpdateTimer(new QTimer(this)), m_cacheSaveFutureWatcher(new QFutureWatcher<void>(this)), m_autoUpdateTimer(new QTimer(this)),
m_feedDownloaderThread(nullptr), m_feedDownloader(nullptr), m_feedDownloaderThread(nullptr), m_feedDownloader(nullptr),
m_dbCleanerThread(nullptr), m_dbCleaner(nullptr) { m_dbCleanerThread(nullptr), m_dbCleaner(nullptr) {
m_feedsModel = new FeedsModel(this); m_feedsModel = new FeedsModel(this);
@ -46,7 +46,7 @@ FeedReader::FeedReader(QObject *parent)
m_messagesModel = new MessagesModel(this); m_messagesModel = new MessagesModel(this);
m_messagesProxyModel = new MessagesProxyModel(m_messagesModel, this); m_messagesProxyModel = new MessagesProxyModel(m_messagesModel, this);
connect(&m_cacheSaveFutureWatcher, &QFutureWatcher<void>::finished, this, &FeedReader::asyncCacheSaveFinished); connect(m_cacheSaveFutureWatcher, &QFutureWatcher<void>::finished, this, &FeedReader::asyncCacheSaveFinished);
connect(m_autoUpdateTimer, &QTimer::timeout, this, &FeedReader::executeNextAutoUpdate); connect(m_autoUpdateTimer, &QTimer::timeout, this, &FeedReader::executeNextAutoUpdate);
updateAutoUpdateStatus(); updateAutoUpdateStatus();
asyncCacheSaveFinished(); asyncCacheSaveFinished();
@ -219,7 +219,7 @@ void FeedReader::checkServicesForAsyncOperations() {
} }
void FeedReader::checkServicesForAsyncOperations(bool wait_for_future) { 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."); 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). // we save all cached data (app exit).
if (wait_for_future) { if (wait_for_future) {
qWarning("Waiting for previously started saving of cached service data."); qWarning("Waiting for previously started saving of cached service data.");
m_cacheSaveFutureWatcher.future().waitForFinished(); m_cacheSaveFutureWatcher->future().waitForFinished();
} }
else { else {
qWarning("Some cached service data are being saved now, so aborting this saving cycle."); 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(); future.waitForFinished();
} }
else { else {
m_cacheSaveFutureWatcher.setFuture(future); m_cacheSaveFutureWatcher->setFuture(future);
} }
} }

2
src/miscellaneous/feedreader.h
View File

@ -94,7 +94,7 @@ class FeedReader : public QObject {
MessagesModel *m_messagesModel; MessagesModel *m_messagesModel;
MessagesProxyModel *m_messagesProxyModel; MessagesProxyModel *m_messagesProxyModel;
QFutureWatcher<void> m_cacheSaveFutureWatcher; QFutureWatcher<void> *m_cacheSaveFutureWatcher;
// Auto-update stuff. // Auto-update stuff.
QTimer *m_autoUpdateTimer; QTimer *m_autoUpdateTimer;