Uniformize Inset construction (passing Buffer * everywhere). Lots of cleanup to do...

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

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 11de094dedf61b98dd6c2bf7e40ed1809e73a93d..0623230148d4f086439a4d2c2dfc0094532caea3 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -96,8 +96,9 @@ public:
        virtual ~Inset() {}
 
        /// change associated Buffer
-       /// FIXME this should go.
        virtual void setBuffer(Buffer & buffer);
+       /// remove the buffer reference
+       void resetBuffer() { setBuffer( *static_cast<Buffer *>(0)); }
        /// retrieve associated Buffer
        virtual Buffer & buffer();
        virtual Buffer const & buffer() const;
@@ -120,6 +121,8 @@ public:
 
        /// identification as math inset
        virtual InsetMath * asInsetMath() { return 0; }
+       /// identification as math inset
+       virtual InsetMath const * asInsetMath() const { return 0; }
        /// true for 'math' math inset, but not for e.g. mbox
        virtual bool inMathed() const { return false; }
        /// is this inset based on the InsetText class?
@@ -306,7 +309,7 @@ public:
        virtual bool hasSettings() const;
        /// can we go further down on mouse click?
        // true for InsetCaption, InsetCollapsables (not ButtonOnly), InsetTabular
-       virtual bool descendable() const { return false; }
+       virtual bool descendable(BufferView const &) const { return false; }
        /// is this an inset that can be moved into?
        /// FIXME: merge with editable()
        // true for InsetTabular & InsetText
@@ -498,19 +501,12 @@ public:
        virtual ColorCode backgroundColor() const;
        ///
        virtual ColorCode labelColor() const;
-       ///
-       enum CollapseStatus {
-               Collapsed,
-               Open
-       };
-       ///
-       virtual void setStatus(Cursor &, CollapseStatus) {}
        //
        enum { TEXT_TO_INSET_OFFSET = 4 };
 
 protected:
        /// Constructors
-       Inset() : buffer_(0) {}
+       Inset(Buffer * buf) : buffer_(buf) {}
        Inset(Inset const &) : buffer_(0) {}
 
        /// replicate ourselves