From 3cdc6fb9781cdc8be16e9c9bdfcadd2e3d581998 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Mon, 24 Apr 2017 04:24:32 +0300 Subject: [PATCH] Fix compiler warnings. --- src/base/rss/rss_article.cpp | 2 +- src/base/rss/rss_session.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base/rss/rss_article.cpp b/src/base/rss/rss_article.cpp index 2da933666..8fe99ea22 100644 --- a/src/base/rss/rss_article.cpp +++ b/src/base/rss/rss_article.cpp @@ -160,7 +160,7 @@ Article *Article::fromVariantHash(Feed *feed, const QVariantHash &varHash) guid = varHash.value(Str_Torrent_Url).toString(); if (guid.isEmpty()) guid = varHash.value(Str_Title).toString(); - if (guid.isEmpty()) nullptr; + if (guid.isEmpty()) return nullptr; return new Article(feed, guid , varHash.value(Str_Date).toDateTime() diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp index ced8e91af..123c6d04f 100644 --- a/src/base/rss/rss_session.cpp +++ b/src/base/rss/rss_session.cpp @@ -63,9 +63,9 @@ using namespace RSS; QPointer Session::m_instance = nullptr; -Session::Session() - : m_workingThread(new QThread(this)) - , m_processingEnabled(SettingsStorage::instance()->loadValue(SettingsKey_ProcessingEnabled, false).toBool()) +Session::Session() + : m_processingEnabled(SettingsStorage::instance()->loadValue(SettingsKey_ProcessingEnabled, false).toBool()) + , m_workingThread(new QThread(this)) , m_refreshInterval(SettingsStorage::instance()->loadValue(SettingsKey_RefreshInterval, 30).toUInt()) , m_maxArticlesPerFeed(SettingsStorage::instance()->loadValue(SettingsKey_MaxArticlesPerFeed, 50).toInt()) {