move some selection related stuff over to textcursor.C

[lyx.git] / src / tabular_funcs.h

diff --git a/src/tabular_funcs.h b/src/tabular_funcs.h
index e2ce28f1e7948b9be1a76b371f1c000d0b070001..78e9b0e784fe25ea26d7364e3752356ef4cc5665 100644 (file)
--- a/src/tabular_funcs.h
+++ b/src/tabular_funcs.h
@@ -14,9 +14,8 @@
 #ifndef TABULAR_FUNCS_H
 #define TABULAR_FUNCS_H
 
-#include "LString.h"
 #include "tabular.h"
-#include "support/lstrings.h" // for tostr
+#include "support/tostr.h"
 
 #include <iosfwd>
 
@@ -42,21 +41,21 @@ string const tostr(LyXTabular::VAlignment const & num);
 string const tostr(LyXTabular::BoxType const & num);
 
 // I would have liked a fromstr template a lot better. (Lgb)
-extern bool string2type(string const str, LyXAlignment & num);
-extern bool string2type(string const str, LyXTabular::VAlignment & num);
-extern bool string2type(string const str, LyXTabular::BoxType & num);
-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,
+bool string2type(string const str, LyXAlignment & num);
+bool string2type(string const str, LyXTabular::VAlignment & num);
+bool string2type(string const str, LyXTabular::BoxType & num);
+bool string2type(string const str, bool & num);
+bool getTokenValue(string const & str, char const * token, string &ret);
+bool getTokenValue(string const & str, char const * token, int & num);
+bool getTokenValue(string const & str, char const * token,
                          LyXAlignment & num);
-extern bool getTokenValue(string const & str, char const * token,
+bool getTokenValue(string const & str, char const * token,
                          LyXTabular::VAlignment & num);
-extern bool getTokenValue(string const & str, char const * token,
+bool getTokenValue(string const & str, char const * token,
                          LyXTabular::BoxType & num);
-extern bool getTokenValue(string const & str, char const * token, bool & flag);
-extern bool getTokenValue(string const & str, char const * token,
+bool getTokenValue(string const & str, char const * token, bool & flag);
+bool getTokenValue(string const & str, char const * token,
                          LyXLength & len);
-extern void l_getline(std::istream & is, string & str);
+void l_getline(std::istream & is, string & str);
 
 #endif