0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE use FS a bit more

Browse Source
This commit is contained in:
Petr Mrázek
2015-06-03 21:10:28 +02:00
parent 3a8b238052
commit 06a67fbd38
5 changed files with 36 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
logic/BaseConfigObject.cpp
View File

@@ -16,12 +16,12 @@
#include "BaseConfigObject.h"
#include <QTimer>
#include <QSaveFile>
#include <QFile>
#include <QCoreApplication>
#include <QDebug>
#include "Exception.h"
#include "FileSystem.h"
BaseConfigObject::BaseConfigObject(const QString &filename)
: m_filename(filename)
@@ -76,19 +76,13 @@ void BaseConfigObject::saveNow()
return;
}
QSaveFile file(m_filename);
if (!file.open(QFile::WriteOnly))
try
{
qWarning() << "Couldn't open" << m_filename << "for writing:" << file.errorString();
return;
FS::write(m_filename, doSave());
}
// cppcheck-suppress pureVirtualCall
file.write(doSave());
if (!file.commit())
catch (Exception & e)
{
qCritical() << "Unable to commit the file" << file.fileName() << ":" << file.errorString();
file.cancelWriting();
qCritical() << e.cause();
}
}
void BaseConfigObject::loadNow()
@@ -98,21 +92,11 @@ void BaseConfigObject::loadNow()
saveNow();
}
QFile file(m_filename);
if (!file.exists())
{
return;
}
if (!file.open(QFile::ReadOnly))
{
qWarning() << "Couldn't open" << m_filename << "for reading:" << file.errorString();
return;
}
try
{
doLoad(file.readAll());
doLoad(FS::read(m_filename));
}
catch (Exception &e)
catch (Exception & e)
{
qWarning() << "Error loading" << m_filename << ":" << e.cause();
}