use the new bufferstorage (this change only deletes all references to the old one

[lyx.git] / src / table.h

diff --git a/src/table.h b/src/table.h
index 39918ee535a779148e00f825b7babda51707bd4b..c35b01c063b76e5cee83e33b04302e79cafe67e3 100644 (file)
--- a/src/table.h
+++ b/src/table.h
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
  *      
  *       Copyright (C) 1995, 1996 Matthias Ettrich
  *
- *======================================================*/
+ * ====================================================== */
 #ifndef TABLE_H
 #define TABLE_H
 
@@ -14,9 +14,8 @@
 #pragma interface
 #endif
 
-#include <config.h>
-#include <stdio.h>
-#include "definitions.h"
+#include <cstdio>
+
 #include "lyxlex.h"
 #include "LString.h"
 
@@ -115,15 +114,15 @@ public:
        /// Returns true if a complete update is necessary, otherwise false
        bool SetAlignment(int cell, char align);
         ///
-       bool SetPWidth(int cell, LString width);
+       bool SetPWidth(int cell, string width);
         ///
-       bool SetAlignSpecial(int cell, LString special,int what);
+       bool SetAlignSpecial(int cell, string special, int what);
        ///
        char GetAlignment(int cell); // add approp. signedness
         ///
-        LString GetPWidth(int cell);
+        string GetPWidth(int cell);
         ///
-        LString GetAlignSpecial(int cell, int what);
+        string GetAlignSpecial(int cell, int what);
 
        ///
        int GetWidthOfCell(int cell);
@@ -167,13 +166,13 @@ public:
        // cell <0 will tex the preamble
        // returns the number of printed newlines
        ///
-       int TexEndOfCell(LString& file, int cell);
+       int TexEndOfCell(string & file, int cell);
        ///
        int RoffEndOfCell(FILE* file, int cell);
        ///
-       const char *getDocBookAlign(int cell, bool isColumn=false);
+       char const *getDocBookAlign(int cell, bool isColumn= false);
        ///
-       int DocBookEndOfCell(LString &file, int cell, int &depth);
+       int DocBookEndOfCell(string &file, int cell, int &depth);
 
        ///
        bool IsMultiColumn(int cell);
@@ -268,9 +267,9 @@ private:
             ///
             int rotate;
             ///
-            LString align_special;
+            string align_special;
             ///
-            LString p_width; // this is only set for multicolumn!!!
+            string p_width; // this is only set for multicolumn!!!
        };
         ///
         struct rowstruct {
@@ -286,8 +285,8 @@ private:
                 bool left_line;
                 bool right_line;
                 int  width_of_column;
-                LString p_width;
-                LString align_special;
+                string p_width;
+                string align_special;
         };
        ///
        int numberofcells;