Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 2f2c2886df6847beef7c712dc4dff0f7821f353d..52f76e7e2c9c7f05b2a8360c47f0d6f72aa02d49 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -75,14 +75,9 @@ public:
        explicit
        InsetText(InsetText const &);
        ///
-       //explicit
-       //InsetText(InsetText const &, bool same_id);
-       ///
        ~InsetText();
        ///
-       Inset * clone(Buffer const &) const;
-       ///
-       //Inset * clone(Buffer const &, bool same_id) const;
+       Inset * clone() const;
        ///
        InsetText & operator=(InsetText const & it);
        /// empty inset to empty par, or just mark as erased
@@ -92,11 +87,11 @@ public:
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
        int textWidth(BufferView *, bool fordraw = false) const;
        ///
-       void draw(BufferView *, LyXFont const &, int , float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
        void update(BufferView *, bool = false);
        ///
@@ -154,14 +149,10 @@ public:
        ///
        void init(InsetText const * ins);
        ///
-       //void init(InsetText const * ins, bool same_id);
-       ///
        void writeParagraphData(Buffer const *, std::ostream &) const;
        ///
        void setParagraphData(ParagraphList const &);
        ///
-       //void setParagraphData(ParagraphList const &, bool same_id);
-       ///
        void setText(string const &, LyXFont const &);
        ///
        void setAutoBreakRows(bool);
@@ -386,9 +377,9 @@ private:
        mutable boost::shared_ptr<LyXText> cached_text;
        ///
        struct save_state {
-               Paragraph * lpar;
-               Paragraph * selstartpar;
-               Paragraph * selendpar;
+               ParagraphList::iterator lpar;
+               ParagraphList::iterator selstartpar;
+               ParagraphList::iterator selendpar;
                lyx::pos_type pos;
                lyx::pos_type selstartpos;
                lyx::pos_type selendpos;