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

add errorString output argument to IFile::reload() & IEditor::open()

Browse Source 
add/unify read error handling in all affected classes
This commit is contained in:
Oswald Buddenhagen
2011-04-04 15:24:13 +02:00
parent f1f9904d35
commit fae7dc9584
44 changed files with 204 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/designer/formwindoweditor.cpp
View File

@@ -46,6 +46,7 @@
#include <texteditor/plaintexteditor.h>
#include <utils/qtcassert.h>
#include <utils/fileutils.h>
#include <QtDesigner/QDesignerFormWindowInterface>
@@ -79,7 +80,7 @@ FormWindowEditor::FormWindowEditor(Internal::DesignerXmlEditor *editor,
connect(form, SIGNAL(changed()), this, SIGNAL(changed()));
// Revert to saved/load externally modified files.
connect(&d->m_file, SIGNAL(reload(QString)), this, SLOT(slotOpen(QString)));
connect(&d->m_file, SIGNAL(reload(QString*,QString)), this, SLOT(slotOpen(QString*,QString)));
// Force update of open editors model.
connect(&d->m_file, SIGNAL(saved()), this, SIGNAL(changed()));
connect(&d->m_file, SIGNAL(changed()), this, SIGNAL(changed()));
@@ -126,12 +127,12 @@ bool FormWindowEditor::createNew(const QString &contents)
return true;
}
void FormWindowEditor::slotOpen(const QString &fileName)
void FormWindowEditor::slotOpen(QString *errorString, const QString &fileName)
{
open(fileName);
open(errorString, fileName);
}
bool FormWindowEditor::open(const QString &fileName)
bool FormWindowEditor::open(QString *errorString, const QString &fileName)
{
if (Designer::Constants::Internal::debug)
qDebug() << "FormWindowEditor::open" << fileName;
@@ -147,15 +148,14 @@ bool FormWindowEditor::open(const QString &fileName)
const QFileInfo fi(fileName);
const QString absfileName = fi.absoluteFilePath();
QFile file(absfileName);
if (!file.open(QIODevice::ReadOnly|QIODevice::Text))
Utils::FileReader reader;
if (!reader.fetch(absfileName, QIODevice::Text, errorString))
return false;
form->setFileName(absfileName);
const QString contents = QString::fromUtf8(file.readAll());
const QString contents = QString::fromUtf8(reader.data());
form->setContents(contents);
file.close();
if (!form->mainContainer())
return false;
form->setDirty(false);