Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 05063aa53ababd945a09de84fe1a53e24e63cb36..49fec77faedc3c0968a44244281f6665bc4a2193 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -76,23 +76,19 @@ public:
        ///
        InsetTabular(Buffer const &, int rows = 1, int columns = 1);
        ///
-       InsetTabular(InsetTabular const &, Buffer const &);
-       ///
-       //InsetTabular(InsetTabular const &, Buffer const &, bool same_id);
+       InsetTabular(InsetTabular const &);
        ///
        ~InsetTabular();
        ///
-       Inset * clone(Buffer const &) const;
-       ///
-       //Inset * clone(Buffer const &, bool same_id) const;
+       Inset * clone() const;
        ///
        void read(Buffer const *, LyXLex &);
        ///
        void write(Buffer const *, std::ostream &) 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;
        ///
        void update(BufferView *, bool = false);
        ///
@@ -158,8 +154,6 @@ public:
        ///
        int getMaxWidth(BufferView *, UpdatableInset const *) const;
        ///
-       Buffer * bufferOwner() const { return const_cast<Buffer *>(buffer); }
-       ///
        LyXText * getLyXText(BufferView const *,
                             bool const recursive = false) const;
        ///
@@ -234,6 +228,10 @@ public:
 
        ///
        virtual BufferView * view() const;
+
+       /// set the owning buffer
+       void buffer(Buffer * b);
+
 private:
        ///
        void lfunMousePress(FuncRequest const &);
@@ -321,7 +319,7 @@ private:
        ///
        InsetText * old_locking_inset;
        ///
-       Buffer const * buffer;
+       Buffer const * buffer_;
        ///
        mutable LyXCursor cursor_;
        ///