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

[lyx.git] / src / insets / insetref.h

diff --git a/src/insets/insetref.h b/src/insets/insetref.h
index f7519042fe872f24bbd87da9e980d84092b5c78d..b9e63412de15d4f2f014d28051b573f678f8c85b 100644 (file)
--- a/src/insets/insetref.h
+++ b/src/insets/insetref.h
@@ -4,12 +4,12 @@
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1997 LyX Team (this file was created this year)
+ *         Copyright 1997 LyX Team (this file was created this year)
  * 
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_REF_H
-#define _INSET_REF_H
+#ifndef INSET_REF_H
+#define INSET_REF_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -33,27 +33,27 @@ public:
        };
        
        ///
-       InsetRef(): InsetCommand("ref") { flag = InsetRef::REF; }
+       InsetRef() : InsetCommand("ref") { flag = InsetRef::REF; }
        ///
-       InsetRef(LString const &, Buffer*);
+       InsetRef(string const &, Buffer *);
        ///
-       InsetRef(InsetCommand const&, Buffer*);
-       ///
-       ~InsetRef();
+       InsetRef(InsetCommand const &, Buffer *);
         ///
-        Inset* Clone() { return new InsetRef (getCommand(), master); }
+        Inset * Clone() const {
+               return new InsetRef (getCommand(), master);
+       }
        ///
        Inset::Code LyxCode() const { return Inset::REF_CODE; }
        ///
-       void Edit(int, int);
+       void Edit(BufferView *, int, int, unsigned int);
        ///
-       unsigned char Editable() const {
-               return 1;
+       EDITABLE Editable() const {
+               return IS_EDITABLE;
        }
         ///
-       bool Display() const { return false; }
+       bool display() const { return false; }
        ///
-       LString getScreenLabel() const;
+       string getScreenLabel() const;
        ///
        InsetRef::Ref_Flags getFlag() { return flag; }
        ///
@@ -61,20 +61,20 @@ public:
         ///
         void gotoLabel();
        ///
-       int Latex(FILE *file, signed char fragile);
+       int Latex(std::ostream &, bool fragile, bool free_spc) const;
        ///
-       int Latex(LString &file, signed char fragile);
+       int Ascii(std::ostream &) const;
        ///
-       int Linuxdoc(LString &file);
+       int Linuxdoc(std::ostream &) const;
        ///
-       int DocBook(LString &file);
+       int DocBook(std::ostream &) const;
 private:
        /// This function escapes 8-bit characters
-       LString escape(LString const &) const;
+       string escape(string const &) const;
        ///
         Ref_Flags flag;
         ///
-       Buffer *master;
+       Buffer * master;
 };
 
 
@@ -82,8 +82,7 @@ inline
 void InsetRef::gotoLabel()
 {
     if (master) {
-       master->gotoLabel(getContents());
+       master->getUser()->gotoLabel(getContents());
     }
 }
-
 #endif