Make lyx2lyx output the new external inset format.

[lyx.git] / src / tabular_funcs.h

diff --git a/src/tabular_funcs.h b/src/tabular_funcs.h
index fd686e1575e30461357edaee770475f9d2ab245b..a6925e9c88e3195b04347c71d58ed0a72c7cfa9d 100644 (file)
--- a/src/tabular_funcs.h
+++ b/src/tabular_funcs.h
@@ -1,25 +1,21 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
  *
- * ====================================================== 
+ * ======================================================
  */
 
 #ifndef TABULAR_FUNCS_H
 #define TABULAR_FUNCS_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
 #include "tabular.h"
+#include "support/tostr.h"
 
 #include <iosfwd>
 
@@ -30,7 +26,7 @@ string const write_attribute(string const & name, T const & t)
 {
        if (tostr(t).empty())
                return string();
-       
+
        string str = " " + name + "=\"" + tostr(t) + "\"";
        return str;
 }
@@ -52,14 +48,14 @@ extern bool string2type(string const str, bool & num);
 extern bool getTokenValue(string const & str, char const * token, string &ret);
 extern bool getTokenValue(string const & str, char const * token, int & num);
 extern bool getTokenValue(string const & str, char const * token,
-                          LyXAlignment & num);
+                         LyXAlignment & num);
 extern bool getTokenValue(string const & str, char const * token,
-                          LyXTabular::VAlignment & num);
+                         LyXTabular::VAlignment & num);
 extern bool getTokenValue(string const & str, char const * token,
-                          LyXTabular::BoxType & num);
+                         LyXTabular::BoxType & num);
 extern bool getTokenValue(string const & str, char const * token, bool & flag);
 extern bool getTokenValue(string const & str, char const * token,
-                          LyXLength & len);
+                         LyXLength & len);
 extern void l_getline(std::istream & is, string & str);
 
 #endif