Commit 08c9a1dd authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix clazy warning/cppcheck warning

parent 477850fe
...@@ -69,9 +69,7 @@ void ImportFeedListCommand::Private::doImport() ...@@ -69,9 +69,7 @@ void ImportFeedListCommand::Private::doImport()
const QSharedPointer<FeedList> target = targetList.lock(); const QSharedPointer<FeedList> target = targetList.lock();
if (!target) { if (!target) {
if (!target) { qCWarning(AKREGATOR_LOG) << "Target list was deleted, could not import feed list";
qCWarning(AKREGATOR_LOG) << "Target list was deleted, could not import feed list";
}
q->done(); q->done();
return; return;
} }
......
...@@ -146,10 +146,6 @@ void LoadFeedListCommand::Private::doLoad() ...@@ -146,10 +146,6 @@ void LoadFeedListCommand::Private::doLoad()
Q_ASSERT(!fileName.isNull()); Q_ASSERT(!fileName.isNull());
Q_EMIT q->progress(0, i18n("Opening Feed List...")); Q_EMIT q->progress(0, i18n("Opening Feed List..."));
QString str;
const QString listBackup = storage->restoreFeedList();
QDomDocument doc; QDomDocument doc;
if (!QFileInfo::exists(fileName)) { if (!QFileInfo::exists(fileName)) {
......
...@@ -375,7 +375,7 @@ void Feed::loadFavicon(const QString &url, bool downloadFavicon) ...@@ -375,7 +375,7 @@ void Feed::loadFavicon(const QString &url, bool downloadFavicon)
Akregator::DownloadFeedIconJob *job = new Akregator::DownloadFeedIconJob(this); Akregator::DownloadFeedIconJob *job = new Akregator::DownloadFeedIconJob(this);
job->setFeedIconUrl(url); job->setFeedIconUrl(url);
job->setDownloadFavicon(downloadFavicon); job->setDownloadFavicon(downloadFavicon);
connect(job, &DownloadFeedIconJob::result, this, [job, this](const QString &result) { connect(job, &DownloadFeedIconJob::result, this, [this](const QString &result) {
setFaviconUrl(result); setFaviconUrl(result);
}); });
if (!job->start()) { if (!job->start()) {
......
...@@ -37,10 +37,10 @@ using namespace Akregator; ...@@ -37,10 +37,10 @@ using namespace Akregator;
GrantleeViewFormatter::GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, int deviceDpiY) GrantleeViewFormatter::GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, int deviceDpiY)
: GrantleeTheme::GenericFormatter(htmlFileName, themePath) : GrantleeTheme::GenericFormatter(htmlFileName, themePath)
, mHtmlArticleFileName(htmlFileName) , mHtmlArticleFileName(htmlFileName)
, mDirectionString(QApplication::isRightToLeft() ? QStringLiteral("rtl") : QStringLiteral("ltr"))
, mGrantleeThemePath(QStringLiteral("file://") + themePath + QLatin1Char('/')) , mGrantleeThemePath(QStringLiteral("file://") + themePath + QLatin1Char('/'))
, mDeviceDpiY(deviceDpiY) , mDeviceDpiY(deviceDpiY)
{ {
mDirectionString = QApplication::isRightToLeft() ? QStringLiteral("rtl") : QStringLiteral("ltr");
setApplicationDomain("akregator"); setApplicationDomain("akregator");
} }
......
...@@ -105,11 +105,7 @@ void OpenUrlRequest::setOptions(OpenUrlRequest::Options options) ...@@ -105,11 +105,7 @@ void OpenUrlRequest::setOptions(OpenUrlRequest::Options options)
QString OpenUrlRequest::debugInfo() const QString OpenUrlRequest::debugInfo() const
{ {
return QStringLiteral("url=%1 mimeType=%2 newTab=%3 forcesNewWindow=%4 options=%5") return QStringLiteral("url=%1 mimeType=%2 newTab=%3 forcesNewWindow=%4 options=%5")
.arg(m_url.url()) .arg(m_url.url(), m_args.mimeType()).arg(m_browserArgs.newTab()).arg(m_browserArgs.forcesNewWindow()).arg(m_options);
.arg(m_args.mimeType())
.arg(m_browserArgs.newTab())
.arg(m_browserArgs.forcesNewWindow())
.arg(m_options);
} }
bool OpenUrlRequest::wasHandled() const bool OpenUrlRequest::wasHandled() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment