Misc small changes

[wxWidgets.git] / include / wx / textfile.h

diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index ca4b623890e8e306eaa9fc778b1200fbab894744..b6132bd178a2f5f04bf020cf5b521c8b8d792a34 100644 (file)
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -4,7 +4,7 @@
 //              (file is fully loaded in memory) and which understands CR/LF
 //              differences between platforms.
 // Author:      Vadim Zeitlin
 //              (file is fully loaded in memory) and which understands CR/LF
 //              differences between platforms.
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     03.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -26,25 +26,28 @@
 // ----------------------------------------------------------------------------
 // wxTextFile
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextFile
 // ----------------------------------------------------------------------------

+
+// the line termination type
+enum wxTextFileType
+{
+    wxTextFileType_None,  // incomplete (the last line of the file only)
+    wxTextFileType_Unix,  // line is terminated with 'LF' = 0xA = 10 = '\n'
+    wxTextFileType_Dos,   //                         'CR' 'LF'
+    wxTextFileType_Mac    //                         'CR' = 0xD = 13 = '\r'
+};
+
+WX_DEFINE_ARRAY(wxTextFileType, ArrayFileType);
+

 class wxTextFile
 {
 public:
 class wxTextFile
 {
 public:

-  // constants
-  enum Type
-  {
-    Type_None,  // incomplete (the last line of the file only)
-    Type_Unix,  // line is terminated with 'CR' = 0xA = 10 = '\n'
-    Type_Dos,   //                         'LF' 'CR'
-    Type_Mac    //                         'LF' = 0xD = 12 = '\r'
-  };
-

   // default type for current platform (determined at compile time)
   // default type for current platform (determined at compile time)

-  static const Type typeDefault;
+  static const wxTextFileType typeDefault;

 
   // ctors
     // def ctor, use Open(string)
   wxTextFile() { }
 
   // ctors
     // def ctor, use Open(string)
   wxTextFile() { }

-    // 
+    //

   wxTextFile(const wxString& strFile);
 
   // file operations
   wxTextFile(const wxString& strFile);
 
   // file operations


@@ -61,45 +64,57 @@ public:
 
   // accessors
     // get the number of lines in the file
 
   // accessors
     // get the number of lines in the file

-  size_t    GetLineCount() const { return m_aLines.Count(); }
+  size_t GetLineCount() const { return m_aLines.Count(); }

     // the returned line may be modified (but don't add CR/LF at the end!)
   wxString& GetLine(size_t n)    const { return m_aLines[n]; }
   wxString& operator[](size_t n) const { return m_aLines[n]; }
     // the returned line may be modified (but don't add CR/LF at the end!)
   wxString& GetLine(size_t n)    const { return m_aLines[n]; }
   wxString& operator[](size_t n) const { return m_aLines[n]; }

+
+    // the current line has meaning only when you're using
+    // GetFirstLine()/GetNextLine() functions, it doesn't get updated when
+    // you're using "direct access" i.e. GetLine()
+  size_t GetCurrentLine() const { return m_nCurLine; }
+  void GoToLine(size_t n) { m_nCurLine = n; }
+  bool Eof() const { return m_nCurLine == m_aLines.Count() - 1; }
+
+    // these methods allow more "iterator-like" traversal of the list of
+    // lines, i.e. you may write something like:
+    //  for ( str = GetFirstLine(); !Eof(); str = GetNextLine() ) { ... }
+
+    // NB: const is commented out because not all compilers understand
+    //     'mutable' keyword yet (m_nCurLine should be mutable)
+  wxString& GetFirstLine() /* const */ { return m_aLines[m_nCurLine = 0]; }
+  wxString& GetNextLine()  /* const */ { return m_aLines[++m_nCurLine];   }
+  wxString& GetPrevLine()  /* const */
+    { wxASSERT(m_nCurLine > 0); return m_aLines[--m_nCurLine];   }
+  wxString& GetLastLine() /* const */
+    { return m_aLines[m_nCurLine = m_aLines.Count() - 1]; }
+

     // get the type of the line (see also GetEOL)
     // get the type of the line (see also GetEOL)

-  Type GetLineType(size_t n) const { return m_aTypes[n]; }
+  wxTextFileType GetLineType(size_t n) const { return m_aTypes[n]; }

     // guess the type of file (m_file is supposed to be opened)
     // guess the type of file (m_file is supposed to be opened)

-  Type GuessType() const;
+  wxTextFileType GuessType() const;

     // get the name of the file
     // get the name of the file

-  const char *GetName() const { return m_strFile.c_str(); }
+  const wxChar *GetName() const { return m_strFile.c_str(); }

 
   // add/remove lines
     // add a line to the end
 
   // add/remove lines
     // add a line to the end

-  void AddLine(const wxString& str, Type type = typeDefault) 
+  void AddLine(const wxString& str, wxTextFileType type = typeDefault)

     { m_aLines.Add(str); m_aTypes.Add(type); }
     // insert a line before the line number n
     { m_aLines.Add(str); m_aTypes.Add(type); }
     // insert a line before the line number n

-  void InsertLine(const wxString& str, size_t n, Type type = typeDefault) 
+  void InsertLine(const wxString& str,
+                  size_t n,
+                  wxTextFileType type = typeDefault)

     { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
     // delete one line
   void RemoveLine(size_t n) { m_aLines.Remove(n); m_aTypes.Remove(n); }
 
   // change the file on disk (default argument means "don't change type")
   // possibly in another format
     { m_aLines.Insert(str, n); m_aTypes.Insert(type, n); }
     // delete one line
   void RemoveLine(size_t n) { m_aLines.Remove(n); m_aTypes.Remove(n); }
 
   // change the file on disk (default argument means "don't change type")
   // possibly in another format

-  bool Write(Type typeNew = Type_None);
+  bool Write(wxTextFileType typeNew = wxTextFileType_None);

 
   // get the file termination string
 
   // get the file termination string

-  inline static const char *GetEOL(Type type = typeDefault)
-  {
-    switch ( type ) {
-      case Type_None: return "";
-      case Type_Unix: return "\n";
-      case Type_Dos:  return "\r\n";
-      case Type_Mac:  return "\r";
-
-      default:
-        wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
-        return NULL;
-    }
-  }
+  // Note: implementation moved to textfile to prevent warning due to switch.
+  static const wxChar *GetEOL(wxTextFileType type = typeDefault);

 
   // dtor
   ~wxTextFile();
 
   // dtor
   ~wxTextFile();


@@ -112,11 +127,13 @@ private:
   // read the file in memory (m_file is supposed to be just opened)
   bool Read();
 
   // read the file in memory (m_file is supposed to be just opened)
   bool Read();
 

-  WX_DEFINE_ARRAY(Type, ArrayFileType);
-

   wxFile        m_file;     // current file
   wxFile        m_file;     // current file

+

   ArrayFileType m_aTypes;   // type of each line
   wxArrayString m_aLines;   // lines of file
   ArrayFileType m_aTypes;   // type of each line
   wxArrayString m_aLines;   // lines of file

+
+  size_t        m_nCurLine; // number of current line in the file
+

   wxString      m_strFile;  // name of the file
 };
 
   wxString      m_strFile;  // name of the file
 };