Andres fixes to sstrem problems

[lyx.git] / src / texrow.h

diff --git a/src/texrow.h b/src/texrow.h
index 11aa605740c374896276f56c3725ec6c8c1929ca..674d3c58dc8060a652d04ca353c05d2d5730dc11 100644 (file)
--- a/src/texrow.h
+++ b/src/texrow.h
@@ -1,21 +1,23 @@
 // -*- C++ -*-
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1998 The LyX Team
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team
  *
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _TEXROW_H
-#define _TEXROW_H
+#ifndef TEXROW_H
+#define TEXROW_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include <list>
+
 class LyXParagraph;
 
 // Controls correspondance between paragraphs and the generated LaTeX file
@@ -24,38 +26,32 @@ public:
        ///
        TexRow() {
                count = 0;
-               next = 0;
                lastpar = 0;
                lastpos = -1;
        }
-       ///
-       ~TexRow() {
-               reset();
-       }
 
        /// Clears structure
        void reset();
 
        /// Define what paragraph and position the next row will represent
-       void start(LyXParagraph *par, int pos);
+       void start(LyXParagraph * par, int pos);
 
        /// Insert node when line is completed
        void newline();
 
        /// Returns paragraph id and position from a row number
-       void getIdFromRow(int row, int &id, int &pos);
+       void getIdFromRow(int row, int & id, int & pos);
 
        /// Appends another TexRow
-       TexRow & operator+=(const TexRow &);
+       TexRow & operator+= (TexRow const &);
 
 private:
        /// Linked list of items
-       struct TexRow_Item {
+       struct RowItem {
                ///
-               TexRow_Item() {
+               RowItem() {
                        id = -1;
                        pos = -1;
-                       next = 0;
                        rownumber = 0;
                }
 
@@ -65,13 +61,13 @@ private:
                int pos;
                ///
                int rownumber;
-               ///
-               TexRow_Item *next;
        };
        ///
        unsigned int count;
        ///
-       TexRow_Item *next;
+       typedef std::list<RowItem> RowList;
+       ///
+       RowList rowlist;
        /// Last paragraph
        LyXParagraph * lastpar;
        /// Last position