simplificatons

[features.git] / src / insets / inset.h

diff --git a/src/insets/inset.h b/src/insets/inset.h
index b8b7dda9138d04ea535a3de237366c5c1bf6e96e..b0951ffe3ec483ba94e4a0ae9afedd4af6cb80c5 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -96,8 +96,10 @@ public:
                TABULAR_CODE,
                ///
                EXTERNAL_CODE,
+#if 0
                ///
                THEOREM_CODE,
+#endif
                ///
                CAPTION_CODE,
                ///
@@ -220,9 +222,9 @@ public:
        ///
        virtual bool needFullRow() const { return false; }
        ///
-       void setInsetName(string const & s) { name = s; }
+       void setInsetName(string const & s) { name_ = s; }
        ///
-       string const getInsetName() const { return name; }
+       string const & getInsetName() const { return name_; }
        ///
        void setOwner(Inset * inset) { owner_ = inset; }
        ///
@@ -276,8 +278,16 @@ public:
        /// used to toggle insets
        // is the inset open?
        virtual bool isOpen() const { return false; }
-       // open or close the inset, depending on the bool
+#if 0
+       /// open or close the inset, depending on the bool
        virtual void open(BufferView *, bool) {}
+#else
+       /// open the inset
+       virtual void open(BufferView *) {}
+#endif
+       /// close the inset
+       virtual void close(BufferView *) {}
+       
 protected:
        ///
        mutable int top_x;
@@ -294,7 +304,7 @@ private:
        ///
        Inset * owner_;
        ///
-       string name;
+       string name_;
        ///
        LColor::color background_color_;
 };
@@ -437,7 +447,7 @@ public:
        ///
        // needed for spellchecking text
        ///
-       virtual string selectNextWord(BufferView *, float & value) const;
+       virtual string const selectNextWord(BufferView *, float & value) const;
        virtual void selectSelectedWord(BufferView *) { return; }
        virtual void toggleSelection(BufferView *, bool /*kill_selection*/) {
                return;