[Kst] branches/work/kst/portto4/kst/src/datasources/dirfilesource

Mike Fenton mike at staikos.net
Fri Nov 7 16:38:56 CET 2008


SVN commit 881254 by fenton:

Fix DirFile source not correctly parsing the incoming filename when validating.


 M  +4 -5      dirfilesource.cpp  


--- branches/work/kst/portto4/kst/src/datasources/dirfilesource/dirfilesource.cpp #881253:881254
@@ -323,8 +323,7 @@
   Q_UNUSED(type)
   QStringList scalarList;
 
-  Dirfile dirfile(filename.toLatin1(), GD_RDONLY);
-
+  Dirfile dirfile(getDirectory(filename).toLatin1(), GD_RDONLY);
   if (dirfile.Error() == GD_E_OK) {
 
     scalarList.append("FRAMES");
@@ -354,7 +353,7 @@
   Q_UNUSED(type)
   QStringList stringList;
 
-  Dirfile dirfile(filename.toLatin1(), GD_RDONLY);
+  Dirfile dirfile(getDirectory(filename).toLatin1(), GD_RDONLY);
 
   if (dirfile.Error() == GD_E_OK) {
 
@@ -386,7 +385,7 @@
   
   QStringList fieldList;
 
-  Dirfile dirfile(filename.toLatin1(), GD_RDONLY);
+  Dirfile dirfile(getDirectory(filename).toLatin1(), GD_RDONLY);
 
   if (dirfile.Error() == GD_E_OK) {
 
@@ -432,7 +431,7 @@
 int DirFilePlugin::understands(QSettings *cfg, const QString& filename) const {
   Q_UNUSED(cfg);
 
-  Dirfile dirfile(filename.toLatin1(), GD_RDONLY);
+  Dirfile dirfile(getDirectory(filename).toLatin1(), GD_RDONLY);
 
   if (dirfile.Error() == GD_E_OK) {
     return 98;


More information about the Kst mailing list