feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

add errorString output argument to IFile::save()

Browse Source 
this centralizes error reporting (in fact, in most cases it adds any in
the first place).

Task-number: QTCREATORBUG-1619
This commit is contained in:
Oswald Buddenhagen
2011-03-30 13:45:16 +02:00
parent 469199e7a5
commit f1f9904d35
36 changed files with 116 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/designer/formwindowfile.cpp
View File

@@ -35,6 +35,7 @@
#include <coreplugin/icore.h>
#include <utils/reloadpromptutils.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <QtDesigner/QDesignerFormWindowInterface>
@@ -62,7 +63,7 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
this, SLOT(slotFormWindowRemoved(QDesignerFormWindowInterface*)));
}
bool FormWindowFile::save(const QString &name /* = QString() */)
bool FormWindowFile::save(QString *errorString, const QString &name /* = QString() */)
{
const QString actualName = name.isEmpty() ? fileName() : name;
@@ -79,12 +80,10 @@ bool FormWindowFile::save(const QString &name /* = QString() */)
const QString formName = fi.absoluteFilePath();
m_formWindow->setFileName(formName);
QString errorString;
const bool warningsEnabled = qdesigner_internal::QSimpleResource::setWarningsEnabled(false);
const bool writeOK = writeFile(actualName, errorString);
qdesigner_internal::QSimpleResource::setWarningsEnabled(warningsEnabled);
if (!writeOK) {
QMessageBox::critical(0, tr("Error saving %1").arg(formName), errorString);
m_formWindow->setFileName(oldFormName);
return false;
}
@@ -178,29 +177,14 @@ QString FormWindowFile::mimeType() const
return m_mimeType;
}
bool FormWindowFile::writeFile(const QString &fileName, QString &errorString) const
bool FormWindowFile::writeFile(const QString &fileName, QString *errorString) const
{
if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << m_fileName << fileName;
QFile file(fileName);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
errorString = tr("Unable to open %1: %2").arg(fileName, file.errorString());
return false;
}
const bool rc = writeFile(file, errorString);
file.close();
return rc;
}
bool FormWindowFile::writeFile(QFile &file, QString &errorString) const
{
const QByteArray content = m_formWindow->contents().toUtf8();
if (!file.write(content)) {
errorString = tr("Unable to write to %1: %2").arg(file.fileName(), file.errorString());
return false;
}
return true;
Utils::FileSaver saver(fileName, QIODevice::Text);
saver.write(m_formWindow->contents().toUtf8());
return saver.finalize(errorString);
}
void FormWindowFile::setFileName(const QString &fname)