[Kst] branches/work/kst/portto4/kst

[Adam Treat]

SVN commit 681046 by treat:

* Only one test fails for ascii now.  The last one.


 M  +3 -0      src/datasources/ascii/ascii.cpp  
 M  +3 -0      tests/testrvector.cpp  


--- branches/work/kst/portto4/kst/src/datasources/ascii/ascii.cpp #681045:681046
@@ -218,6 +218,9 @@
 
 int AsciiSource::readFullLine(QFile &file, QByteArray &str) {
   str = file.readLine(1000);
+  if (str.isEmpty())
+    return str.size();
+
   QByteArray strExtra;
   while (str[str.size()-1] != '\n') {
     strExtra = file.readLine(1000);
--- branches/work/kst/portto4/kst/tests/testrvector.cpp #681045:681046
@@ -153,6 +153,7 @@
 
   {
     QTemporaryFile tf;
+    tf.open();
     QTextStream ts(&tf);
     ts << "2 4" << endl;
 
@@ -257,7 +258,9 @@
 
     tf.close();
 
+    rvp->writeLock();
     rvp->reload();
+    rvp->unlock();
     doTest(!rvp->isValid());
   }
 }