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

[Peter Kümmel]

SVN commit 1320500 by kuemmel:

coding style

 M  +2 -2      asciidatainterfaces.h  
 M  +10 -10    asciisource.cpp  
 M  +1 -1      asciisource.h  


--- branches/work/kst/portto4/kst/src/datasources/ascii/asciidatainterfaces.h #1320499:1320500
@@ -62,7 +62,7 @@
   if (!ascii._fieldList.contains(field))
     return DataVector::DataInfo();
 
-  return DataVector::DataInfo(ascii.reader.numberOfFrames(), 1);
+  return DataVector::DataInfo(ascii._reader.numberOfFrames(), 1);
 }
 
 
@@ -78,7 +78,7 @@
 QMap<QString, double> DataInterfaceAsciiVector::metaScalars(const QString&)
 {
   QMap<QString, double> m;
-  m["FRAMES"] = ascii.reader.numberOfFrames();
+  m["FRAMES"] = ascii._reader.numberOfFrames();
   return m;
 }
 
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.cpp #1320499:1320500
@@ -49,7 +49,7 @@
 //-------------------------------------------------------------------------------------------
 AsciiSource::AsciiSource(Kst::ObjectStore *store, QSettings *cfg, const QString& filename, const QString& type, const QDomElement& e) :
   Kst::DataSource(store, cfg, filename, type),
-  reader(_config),
+  _reader(_config),
   _fileBuffer(),
   is(new DataInterfaceAsciiString(*this)),
   iv(new DataInterfaceAsciiVector(*this))
@@ -94,7 +94,7 @@
 {
   // forget about cached data
   _fileBuffer.clear();
-  reader.clear();
+  _reader.clear();
   
   _valid = false;
   _byteLength = 0;
@@ -131,7 +131,7 @@
 //-------------------------------------------------------------------------------------------
 bool AsciiSource::initRowIndex() 
 {
-  reader.clear();
+  _reader.clear();
   _byteLength = 0;
   
   if (_config._dataLine > 0) {
@@ -154,7 +154,7 @@
       }
       header_row++;
     }
-    reader.setRow0Begin(didRead);
+    _reader.setRow0Begin(didRead);
   }
   
   return true;
@@ -211,7 +211,7 @@
   }
   _byteLength = file.size();
   
-  bool new_data = reader.findDataRows(read_completely, file, _byteLength);
+  bool new_data = _reader.findDataRows(read_completely, file, _byteLength);
   
   return (!new_data && !force_update ? NoChange : Updated);
 }
@@ -303,8 +303,8 @@
   }
   
   // check if the already in buffer
-  int begin = reader.beginOfRow(s);
-  int bytesToRead = reader.beginOfRow(s + n) - begin;
+  int begin = _reader.beginOfRow(s);
+  int bytesToRead = _reader.beginOfRow(s + n) - begin;
   if ((begin != _fileBuffer.begin()) || (bytesToRead != _fileBuffer.bytesRead())) {
     QFile file(_filename);
     if (!openValidFile(file)) {
@@ -315,10 +315,10 @@
       success = false;
       return 0;
     }
-    reader.detectLineEndingType(file);
+    _reader.detectLineEndingType(file);
   }
   
-  return reader.readField(_fileBuffer, col, v, field, s, n);
+  return _reader.readField(_fileBuffer, col, v, field, s, n);
 }
 
 
@@ -332,7 +332,7 @@
 //-------------------------------------------------------------------------------------------
 bool AsciiSource::isEmpty() const 
 {
-  return reader.numberOfFrames() < 1;
+  return _reader.numberOfFrames() < 1;
 }
 
 
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciisource.h #1320499:1320500
@@ -68,7 +68,7 @@
     Kst::ObjectList<Kst::Object> autoCurves(Kst::ObjectStore& objectStore);
 
   private:
-    AsciiDataReader reader;
+    AsciiDataReader _reader;
     AsciiFileBuffer _fileBuffer;