Commit 63dad088 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/17.04'

parents 7a2f1f0d c31665c0
......@@ -370,7 +370,7 @@ void Part::slotOnShutdown()
void Part::slotSettingsChanged()
{
NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_mainWidget->window() : 0, componentData().componentName());
NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_mainWidget->window() : nullptr, componentData().componentName());
if (Settings::showTrayIcon() && !TrayIcon::getInstance()) {
TrayIcon *trayIcon = new TrayIcon(m_mainWidget->window());
......@@ -390,8 +390,8 @@ void Part::slotSettingsChanged()
if (!Settings::showTrayIcon()) {
TrayIcon::getInstance()->disconnect();
delete TrayIcon::getInstance();
TrayIcon::setInstance(0);
m_actionManager->setTrayIcon(0);
TrayIcon::setInstance(nullptr);
m_actionManager->setTrayIcon(nullptr);
}
Syndication::FileRetriever::setUseCache(Settings::useHTMLCache());
......@@ -505,7 +505,7 @@ void Part::feedListLoaded(const QSharedPointer<FeedList> &list)
{
Q_ASSERT(!m_standardListLoaded);
m_mainWidget->setFeedList(list);
m_standardListLoaded = list != 0;
m_standardListLoaded = list != nullptr;
if (Settings::markAllFeedsReadOnStartup()) {
m_mainWidget->slotMarkAllFeedsRead();
......@@ -602,7 +602,7 @@ void Part::exportFile(const QUrl &url)
if (url.isLocalFile()) {
const QString fname = url.toLocalFile();
if (QFile::exists(fname) &&
if (QFileInfo::exists(fname) &&
KMessageBox::questionYesNo(m_mainWidget,
i18n("The file %1 already exists; do you want to overwrite it?", fname),
i18n("Export"),
......
......@@ -37,6 +37,7 @@
#include <QPointer>
#include <QString>
#include <QTimer>
#include <QFileInfo>
#include <cassert>
......@@ -145,7 +146,7 @@ void LoadFeedListCommand::Private::doLoad()
QDomDocument doc;
if (!QFile::exists(fileName)) {
if (!QFileInfo::exists(fileName)) {
handleDocument(defaultFeedList);
return;
}
......
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