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

15
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -90,6 +90,7 @@
#include <QtGui/QToolBar>
#include <QtGui/QInputDialog>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
//#define DO_FOO
@@ -520,14 +521,18 @@ void BaseTextEditorWidget::selectEncoding()
CodecSelector codecSelector(this, doc);
switch (codecSelector.exec()) {
case CodecSelector::Reload:
doc->reload(codecSelector.selectedCodec());
case CodecSelector::Reload: {
QString errorString;
if (!doc->reload(&errorString, codecSelector.selectedCodec())) {
QMessageBox::critical(this, tr("File Error"), errorString);
break;
}
setReadOnly(d->m_document->hasDecodingError());
if (doc->hasDecodingError())
currentEditorChanged(Core::EditorManager::instance()->currentEditor());
else
Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String(Constants::SELECT_ENCODING));
break;
break; }
case CodecSelector::Save:
doc->setCodec(codecSelector.selectedCodec());
Core::EditorManager::instance()->saveEditor(editor());
@@ -555,9 +560,9 @@ bool BaseTextEditorWidget::createNew(const QString &contents)
return true;
}
bool BaseTextEditorWidget::open(const QString &fileName)
bool BaseTextEditorWidget::open(QString *errorString, const QString &fileName)
{
if (d->m_document->open(fileName)) {
if (d->m_document->open(errorString, fileName)) {
moveCursor(QTextCursor::Start);
setReadOnly(d->m_document->hasDecodingError());
return true;