Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Use QSaveFile also in other places

Browse Source
This commit is contained in:
David Rosca 2017-06-08 10:14:19 +02:00
parent 1a818e5b6c
commit c9a52e59c3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/adblock/adblockmanager.cpp
View File

@ -35,6 +35,7 @@
#include <QMessageBox>
#include <QUrlQuery>
#include <QMutexLocker>
#include <QSaveFile>
//#define ADBLOCK_DEBUG
@ -200,14 +201,13 @@ AdBlockSubscription* AdBlockManager::addSubscription(const QString &title, const
QByteArray data = QString("Title: %1\nUrl: %2\n[Adblock Plus 1.1.1]").arg(title, url).toLatin1();
QFile file(filePath);
QSaveFile file(filePath);
if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
qWarning() << "AdBlockManager: Cannot write to file" << filePath;
return 0;
}
file.write(data);
file.close();
file.commit();
AdBlockSubscription* subscription = new AdBlockSubscription(title, this);
subscription->setUrl(QUrl(url));

5
src/lib/adblock/adblocksubscription.cpp
View File

@ -53,6 +53,7 @@
#include <QFile>
#include <QTimer>
#include <QNetworkReply>
#include <QSaveFile>
AdBlockSubscription::AdBlockSubscription(const QString &title, QObject* parent)
: QObject(parent)
@ -179,7 +180,7 @@ void AdBlockSubscription::subscriptionDownloaded()
bool AdBlockSubscription::saveDownloadedData(const QByteArray &data)
{
QFile file(m_filePath);
QSaveFile file(m_filePath);
if (!file.open(QFile::ReadWrite | QFile::Truncate)) {
qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "Unable to open adblock file for writing:" << m_filePath;
@ -189,7 +190,7 @@ bool AdBlockSubscription::saveDownloadedData(const QByteArray &data)
// Write subscription header
file.write(QString("Title: %1\nUrl: %2\n").arg(title(), url().toString()).toUtf8());
file.write(data);
file.close();
file.commit();
return true;
}

8
src/lib/bookmarks/bookmarks.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -24,7 +24,7 @@
#include "settings.h"
#include "qztools.h"
#include <QFile>
#include <QSaveFile>
#include <QJsonDocument>
Bookmarks::Bookmarks(QObject* parent)
@ -293,14 +293,14 @@ void Bookmarks::saveBookmarks()
return;
}
QFile file(DataPaths::currentProfilePath() + QLatin1String("/bookmarks.json"));
QSaveFile file(DataPaths::currentProfilePath() + QLatin1String("/bookmarks.json"));
if (!file.open(QFile::WriteOnly)) {
qWarning() << "Bookmarks::saveBookmarks() Error opening bookmarks file for writing!";
}
file.write(data);
file.close();
file.commit();
}
void Bookmarks::loadBookmarksFromMap(const QVariantMap &map)