clear()->erase() ; lots of using directives for cxx

[lyx.git] / src / insets / insetlabel.C

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 0bcfeae9bf225928fa8a06f2e4ef958f9513fad5..0973ad239cd1b419a570cc4609693deaf86241a3 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -15,6 +15,9 @@
 #endif
 
 #include "insetlabel.h"
+#include "support/LOstream.h"
+
+using std::ostream;
 
 /* Label. Used to insert a label automatically */
 
@@ -43,36 +46,20 @@ string InsetLabel::getLabel(int) const
 }
 
 
-int InsetLabel::Latex(ostream & os, signed char /*fragile*/, bool /*fs*/) const
+int InsetLabel::Latex(ostream & os,
+                     bool /*fragile*/, bool /*fs*/) const
 {
        os << escape(getCommand());
        return 0;
 }
 
-
-#ifndef USE_OSTREAM_ONLY
-int InsetLabel::Latex(string & file, signed char /*fragile*/, bool /*fs*/) const
-{
-       file += escape(getCommand());
-       return 0;
-}
-
-
-int InsetLabel::Linuxdoc(string & file) const
+int InsetLabel::Ascii(ostream & os) const
 {
-       file += "<label id=\"" + getContents() +"\" >";
+       os << "<" << getContents()  << ">";
        return 0;
 }
 
 
-int InsetLabel::DocBook(string & file) const
-{
-       file += "<anchor id=\"" + getContents() +"\" >";
-       return 0;
-}
-
-#else
-
 int InsetLabel::Linuxdoc(ostream & os) const
 {
        os << "<label id=\"" << getContents() << "\" >";
@@ -85,9 +72,6 @@ int InsetLabel::DocBook(ostream & os) const
        os << "<anchor id=\"" << getContents() << "\" >";
        return 0;
 }
-#endif
-
-
 
 
 // This function escapes 8-bit characters and other problematic characters