From 4455c6a893cf70ce349e90e02d39cd2fc2d0344d Mon Sep 17 00:00:00 2001
From: hooper114 <hooper114>
Date: Sun, 20 Sep 2009 21:10:24 +0000
Subject: [PATCH] Improved data input from file

---
 frontend_qt4/datawindow.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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