add/unify i/o error handling

lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
This commit is contained in:
Oswald Buddenhagen
2011-03-30 15:15:15 +02:00
parent fae7dc9584
commit 45c9cf7a12
70 changed files with 632 additions and 710 deletions

View File

@@ -35,6 +35,8 @@
#include <coreplugin/coreconstants.h>
#include <utils/fileutils.h>
#include <QtCore/QFileInfo>
#include <QtCore/QDataStream>
@@ -101,10 +103,10 @@ Macro& Macro::operator=(const Macro &other)
return *this;
}
void Macro::load(QString fileName)
bool Macro::load(QString fileName)
{
if (d->events.count())
return; // the macro is not empty
return true; // the macro is not empty
// Take the current filename if the parameter is null
if (fileName.isNull())
@@ -123,10 +125,12 @@ void Macro::load(QString fileName)
macroEvent.load(stream);
append(macroEvent);
}
return true;
}
return false;
}
void Macro::loadHeader(const QString &fileName)
bool Macro::loadHeader(const QString &fileName)
{
d->fileName = fileName;
QFile file(fileName);
@@ -134,21 +138,27 @@ void Macro::loadHeader(const QString &fileName)
QDataStream stream(&file);
stream >> d->version;
stream >> d->description;
return true;
}
return false;
}
void Macro::save(const QString &fileName)
bool Macro::save(const QString &fileName, QWidget *parent)
{
QFile file(fileName);
if (file.open(QFile::WriteOnly)) {
QDataStream stream(&file);
Utils::FileSaver saver(fileName);
if (!saver.hasError()) {
QDataStream stream(saver.file());
stream << d->version;
stream << d->description;
foreach (const MacroEvent &event, d->events) {
event.save(stream);
}
d->fileName = fileName;
saver.setResult(&stream);
}
if (!saver.finalize(parent))
return false;
d->fileName = fileName;
return true;
}
QString Macro::displayName() const