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

11
src/plugins/vcsbase/nicknamedialog.cpp
View File

@@ -33,6 +33,8 @@
#include "nicknamedialog.h"
#include "ui_nicknamedialog.h"
#include <utils/fileutils.h>
#include <QtCore/QDebug>
#include <QtCore/QFile>
#include <QtCore/QDir>
@@ -244,15 +246,12 @@ bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
model->removeRows(0, rowCount);
if (fileName.isEmpty())
return true;
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly|QIODevice::Text)) {
*errorMessage = tr("Cannot open '%1': %2").
arg(QDir::toNativeSeparators(fileName), file.errorString());
Utils::FileReader reader;
if (!reader.fetch(fileName, QIODevice::Text, errorMessage))
return false;
}
// Split into lines and read
NickNameEntry entry;
const QStringList lines = QString::fromUtf8(file.readAll()).trimmed().split(QLatin1Char('\n'));
const QStringList lines = QString::fromUtf8(reader.data()).trimmed().split(QLatin1Char('\n'));
const int count = lines.size();
for (int i = 0; i < count; i++) {
if (entry.parse(lines.at(i))) {