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

add/unify i/o error handling

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -33,11 +33,15 @@
#include "refactoringchanges.h"
#include "basetexteditor.h"
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/fileutils.h>
#include <QtCore/QFile>
#include <QtCore/QSet>
#include <QtGui/QMainWindow>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
#include <QtGui/QTextDocument>
@@ -126,10 +130,11 @@ bool RefactoringChanges::createFile(const QString &fileName, const QString &cont
}
if (!editor) {
QFile file(fileName);
file.open(QFile::WriteOnly);
file.write(document->toPlainText().toUtf8());
Utils::FileSaver saver(fileName);
saver.write(document->toPlainText().toUtf8());
delete document;
if (!saver.finalize(Core::ICore::instance()->mainWindow()))
return false;
}
fileChanged(fileName);
@@ -229,10 +234,9 @@ RefactoringFile::~RefactoringFile()
// if this document doesn't have an editor, write the result to a file
if (!m_editor && !m_fileName.isEmpty()) {
const QByteArray &newContents = doc->toPlainText().toUtf8();
QFile file(m_fileName);
file.open(QFile::WriteOnly);
file.write(newContents);
Utils::FileSaver saver(m_fileName);
saver.write(doc->toPlainText().toUtf8());
saver.finalize(Core::ICore::instance()->mainWindow());
}
if (!m_fileName.isEmpty())
@@ -259,9 +263,9 @@ QTextDocument *RefactoringFile::mutableDocument() const
else if (!m_document) {
QString fileContents;
if (!m_fileName.isEmpty()) {
QFile file(m_fileName);
if (file.open(QIODevice::ReadOnly))
fileContents = file.readAll();
Utils::FileReader reader;
if (reader.fetch(m_fileName, Core::ICore::instance()->mainWindow()))
fileContents = QString::fromUtf8(reader.data());
}
m_document = new QTextDocument(fileContents);
}