X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Farray2dfile.h;h=21023dc3c33f83e63646ec0f4c04717a1039aaf4;hp=0b3da841d43cf135380a14ee6533e40f14bc40f2;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=e203a04e18a94e6c26f54965c54ddb7e025afdd9

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 0b3da84..21023dc 100644
--- a/include/array2dfile.h
+++ b/include/array2dfile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2dfile.h,v 1.7 2000/12/04 03:09:00 kevin Exp $
+**  $Id: array2dfile.h,v 1.12 2000/12/16 06:12:47 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -28,22 +28,22 @@
 #ifndef ARRAY2DFILE_H
 #define ARRAY2DFILE_H
 
-#ifndef WIN32
+#ifndef MSVC
 #include <unistd.h>
 #endif
 
 #include <sys/types.h>
-#include <string.h>
-#include <string>
-#include <fstream>
-#include <iostream>
+#include <cstring>
+#include <string>
+#include <iosfwd>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 #include <vector>
 #include "ctsupport.h"
 #include "fnetorderstream.h"
 #include "array2d.h"
 
-using namespace std;
-
 class Array2dFileLabel
 {
 public:
@@ -61,7 +61,7 @@ public:
 
     ~Array2dFileLabel();
 
-    const string& getLabelString (void) const
+    const std::string& getLabelString (void) const
 	{ return m_strLabel; }
 
     kfloat64 getCalcTime (void) const
@@ -76,19 +76,19 @@ public:
     int getLabelType (void) const
 	{ return m_labelType; }
 
-    string& setLabelString (const char* const str)
+	std::string& setLabelString (const char* const str)
 	{ m_strLabel = str; return (m_strLabel); }
 
-    string& setLabelString (const string& str)
+	std::string& setLabelString (const std::string& str)
 	{ m_strLabel = str; return (m_strLabel); }
 
     void setDateTime (int year, int month, int day, int hour, int minute, int second);
 
     void getDateTime (int& year, int& month, int& day, int& hour, int& minute, int& second) const;
 
-    const string& getDateString () const;
+    const std::string& getDateString () const;
 
-    void print (ostream& os) const;
+    void print (std::ostream& os) const;
 
     Array2dFileLabel (const Array2dFileLabel& rhs);
 
@@ -104,10 +104,10 @@ private:
     kuint16 m_hour;
     kuint16 m_minute;
     kuint16 m_second;
-    string m_strLabel;
+	std::string m_strLabel;
     kfloat64 m_calcTime;
 
-    mutable string m_strDate;
+    mutable std::string m_strDate;
 };
 
 
@@ -171,26 +171,26 @@ public:
 
   bool fileRead (const char* const filename);
 
-  bool fileRead (const string& filename);
+  bool fileRead (const std::string& filename);
 
   bool fileWrite (const char* const filename);
 
-  bool fileWrite (const string& filename);
+  bool fileWrite (const std::string& filename);
 
-  const string& getFilename (void) const 
+  const std::string& getFilename (void) const 
       {  return m_filename; }
 
-  void printLabels (ostream& os) const;
+  void printLabels (std::ostream& os) const;
 
-  typedef vector<Array2dFileLabel*>::iterator labelIterator;
-  typedef vector<Array2dFileLabel*>::const_iterator constLabelIterator;
+  typedef std::vector<Array2dFileLabel*>::iterator labelIterator;
+  typedef std::vector<Array2dFileLabel*>::const_iterator constLabelIterator;
 
  protected:
-  typedef vector<Array2dFileLabel*> labelContainer;
+	 typedef std::vector<Array2dFileLabel*> labelContainer;
 
   static const kuint16 m_signature;
   kuint16 m_headersize;
-  string  m_filename;
+  std::string  m_filename;
 
   kuint16 m_pixelSize;
   kuint16 m_pixelFormat;