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

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

diff --git a/src/insets/insetindex.h b/src/insets/insetindex.h
index a7946b9f364c23221d938cbc92d4969d58644e8c..82642abd31e4eab333ca9edae8aff407e307ebc7 100644 (file)
--- a/src/insets/insetindex.h
+++ b/src/insets/insetindex.h
@@ -1,16 +1,16 @@
 // -*- C++ -*-
 /* This file is part of*
- * ======================================================
+ * ====================================================== 
  *
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
- *                        1996-1998 LyX Team
+ *         Copyright 1995 Matthias Ettrich
+ *          Copyright 1996-2000 the LyX Team.
  * 
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_INDEX_H
-#define _INSET_INDEX_H
+#ifndef INSET_INDEX_H
+#define INSET_INDEX_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -29,61 +29,61 @@ struct LaTeXFeatures;
 class InsetIndex: public InsetCommand {
 public:
        ///
-       InsetIndex(): InsetCommand("index") {;}
+       InsetIndex() : InsetCommand("index") {}
        ///
-       InsetIndex(LString const & key);
+       explicit
+       InsetIndex(string const & key);
        ///
        ~InsetIndex();
        ///
-       Inset *Clone() { return new InsetIndex(contents);}
+       Inset * Clone() const { return new InsetIndex(contents);}
        ///
-       void Edit(int, int);
+       void Edit(BufferView *, int, int, unsigned int);
        ///
-       unsigned char Editable() const
+       EDITABLE Editable() const
        {
-               return 1;
+               return IS_EDITABLE;
        }
        ///
-       LString getScreenLabel() const;
+       string getScreenLabel() const;
 };
 
 
-class InsetPrintIndex: public InsetCommand {
+class InsetPrintIndex : public InsetCommand {
 public:
        ///
        InsetPrintIndex();
        ///
-       InsetPrintIndex(Buffer*);
+       InsetPrintIndex(Buffer *);
        ///
        ~InsetPrintIndex();
        /// Updates needed features for this inset.
-       void Validate(LaTeXFeatures &features) const;
+       void Validate(LaTeXFeatures & features) const;
        ///
-       void Edit(int, int){;}
+       void Edit(BufferView *, int, int, unsigned int) {}
        ///
-       unsigned char Editable() const{
-               return 1;
+       EDITABLE Editable() const{
+               return IS_EDITABLE;
        }
+       /// WHY is clone missing? (Lgb)
        ///
-       bool Display() const { return true; }
+       bool display() const { return true; }
        ///
        Inset::Code LyxCode() const;
        ///
-       LString getScreenLabel() const;
+       string getScreenLabel() const;
 private:
        ///
-       Buffer *owner;
+       Buffer * owner;
 };
 
 // this was shifted here rather than a separate
 // file because its little and only need by
 // insetindex.C and lyx_gui_misc.C ARRae 981020
 struct FD_index_form {
-       FL_FORM *index_form;
-       FL_OBJECT *key;
-       void *vdata;
-       long ldata;
+       FL_FORM * index_form;
+       FL_OBJECT * key;
 };
 
-extern FD_index_form *index_form;
+extern FD_index_form * index_form;
 #endif