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/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -330,26 +330,20 @@ bool VCSBaseSubmitEditor::createNew(const QString &contents)
return true;
}
bool VCSBaseSubmitEditor::open(const QString &fileName)
bool VCSBaseSubmitEditor::open(QString *errorString, const QString &fileName)
{
if (fileName.isEmpty())
return false;
const QFileInfo fi(fileName);
if (!fi.isFile() || !fi.isReadable())
Utils::FileReader reader;
if (!reader.fetch(fileName, QIODevice::Text, errorString))
return false;
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly|QIODevice::Text)) {
qWarning("Unable to open %s: %s", qPrintable(fileName), qPrintable(file.errorString()));
return false;
}
const QString text = QString::fromLocal8Bit(file.readAll());
const QString text = QString::fromLocal8Bit(reader.data());
if (!createNew(text))
return false;
m_d->m_file->setFileName(fi.absoluteFilePath());
m_d->m_file->setFileName(QFileInfo(fileName).absoluteFilePath());
return true;
}