Improved data input from file

This commit is contained in:
hooper114 2009-09-20 21:10:24 +00:00
parent 55f0ea6371
commit 4455c6a893

View file

@ -21,6 +21,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QUiLoader> #include <QUiLoader>
#include <QStringList> #include <QStringList>
#include <QMessageBox>
#include "datawindow.h" #include "datawindow.h"
#include <stdio.h> #include <stdio.h>
@ -73,9 +74,8 @@ void DataWindow::from_file()
QString fileName; QString fileName;
QFileDialog fdialog; QFileDialog fdialog;
QFile file; QFile file;
char *streamdata; QString outstream;
int streamlen; char *c;
QString utfstream;
fdialog.setFileMode(QFileDialog::ExistingFile); fdialog.setFileMode(QFileDialog::ExistingFile);
@ -87,12 +87,14 @@ void DataWindow::from_file()
file.setFileName(fileName); file.setFileName(fileName);
if(!file.open(QIODevice::ReadOnly)) { if(!file.open(QIODevice::ReadOnly)) {
QMessageBox::critical(this, tr("Open Error"), tr("Could not open selected file."));
return; return;
} }
QDataStream input(&file); while(file.getChar(c)) {
streamlen = input.readRawData(streamdata, 7095); outstream += QChar(*c);
utfstream = streamdata; /* FIXME: Does not take account of encoding scheme of input data */ }
txtDataInput->setPlainText(utfstream);
txtDataInput->setPlainText(outstream);
file.close(); file.close();
} }