rename Inset to InsetOld

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

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 89f211c137d6842a4c80231fe3a7a39c6111aaeb..1bac74bbd244f0b7e0f9637fcbbbfcac16844174 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -40,18 +40,14 @@ public:
        ///
        InsetERT(InsetERT const &);
        ///
-       //InsetERT(InsetERT const &, bool same_id);
-       ///
-       Inset * clone(Buffer const &) const;
-       ///
-       //Inset * clone(Buffer const &, bool same_id) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        InsetERT(BufferParams const &,
                 Language const *, string const & contents, bool collapsed);
        ///
        ~InsetERT();
        ///
-       Inset::Code lyxCode() const { return Inset::ERT_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::ERT_CODE; }
        ///
        void read(Buffer const * buf, LyXLex & lex);
        ///
@@ -59,9 +55,9 @@ public:
        ///
        string const editMessage() const;
        ///
-       bool insertInset(BufferView *, Inset *);
+       bool insertInset(BufferView *, InsetOld *);
        ///
-       bool insetAllowed(Inset::Code code) const { return code == Inset::NEWLINE_CODE; }
+       bool insetAllowed(InsetOld::Code code) const { return code == InsetOld::NEWLINE_CODE; }
        ///
        void setFont(BufferView *, LyXFont const &,
                             bool toggleall = false, bool selectall = false);
@@ -103,9 +99,9 @@ public:
        WordLangTuple const
        selectNextWordToSpellcheck(BufferView *, float &) const;
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       void draw(BufferView *, const LyXFont &, int , float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        /// set the status of the inset
        void status(BufferView *, ERTStatus const st) const;
        ///
@@ -113,13 +109,9 @@ public:
        ///
        void getDrawFont(LyXFont &) const;
        ///
-       bool forceDefaultParagraphs(Inset const *) const {
+       bool forceDefaultParagraphs(InsetOld const *) const {
                return true;
        }
-       ///
-       int getMaxWidth(BufferView *, UpdatableInset const *) const;
-       ///
-       void update(BufferView *, bool =false);
 
 private:
        ///
@@ -159,7 +151,7 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
        static void string2params(string const &, InsetERT::ERTStatus &);
        ///