fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3258 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 9855ab701f75efaebe44c54ade39c2cc8758aa5e..481b2bcdbb8cd42c87f3847ed75895ebb0053c03 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-20  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * tabular_funcs.C: add LIstream.h, move write_attribute to..
+       * tabular_funcs.h: here and include iosfwd
+
 2001-12-20  Juergen Vigna  <jug@sad.it>
 
        * undo_funcs.C (textHandleUndo): fixed crash when undo_cursor not

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index b11f0a7a9145e27538c339b46afd459cdd1e380e..de6b67c0a181569acd798a36a52a345f21266430 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -79,11 +79,13 @@ MenuItem::MenuItem(Kind kind, string const & label,
        }
 }
 
+
 string const MenuItem::label() const 
 { 
        return token(label_, '|', 0); 
 }
 
+
 string const MenuItem::shortcut() const
 { 
        return token(label_, '|', 1); 
@@ -246,6 +248,7 @@ void Menu::checkShortcuts() const
        }
 }
 
+
 namespace {
 
 class compare_format {

diff --git a/src/tabular_funcs.C b/src/tabular_funcs.C
index 78181137e1663ce0d64193f6ad26297cd688cb33..2f44fd3e169a3a16fd2a21ecbd71233eb903cbe3 100644 (file)
--- a/src/tabular_funcs.C
+++ b/src/tabular_funcs.C
@@ -17,17 +17,14 @@
 #endif
 
 #include "tabular_funcs.h"
+
 #include "support/lstrings.h"
+#include "support/LIstream.h"
 
+using std::istream;
 
 // Perfect case for a template... (Lgb)
 // or perhaps not...
-template<class T>
-string const write_attribute(string const & name, T const & t)
-{
-       string str = " " + name + "=\"" + tostr(t) + "\"";
-       return str;
-}
 
 template <>
 string const write_attribute(string const & name, bool const & b)

diff --git a/src/tabular_funcs.h b/src/tabular_funcs.h
index d231e5592c1c04a694f1c9fc9c49578ac4841ab2..6f500df26d2139684c20d15889886e7b876a2a64 100644 (file)
--- a/src/tabular_funcs.h
+++ b/src/tabular_funcs.h
@@ -22,11 +22,16 @@
 #include "layout.h"
 #include "tabular.h"
 
+#include <iosfwd>
 
 // Perfect case for a template... (Lgb)
 // or perhaps not...
 template<class T>
-string const write_attribute(string const & name, T const & t);
+string const write_attribute(string const & name, T const & t)
+{
+       string str = " " + name + "=\"" + tostr(t) + "\"";
+       return str;
+}
 template<>
 string const write_attribute(string const & name, bool const & b);
 template<>
@@ -40,17 +45,17 @@ 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, const char * token, string &ret);
-extern bool getTokenValue(string const & str, const char * token, int & num);
-extern bool getTokenValue(string const & str, const char * token,
+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);
-extern bool getTokenValue(string const & str, const char * token,
+extern bool getTokenValue(string const & str, char const * token,
                           LyXTabular::VAlignment & num);
-extern bool getTokenValue(string const & str, const char * token,
+extern bool getTokenValue(string const & str, char const * token,
                           LyXTabular::BoxType & num);
-extern bool getTokenValue(string const & str, const char * token, bool & flag);
-extern bool getTokenValue(string const & str, const char * token,
+extern bool getTokenValue(string const & str, char const * token, bool & flag);
+extern bool getTokenValue(string const & str, char const * token,
                           LyXLength & len);
-extern void l_getline(istream & is, string & str);
+extern void l_getline(std::istream & is, string & str);
 
 #endif