Trying to solve bug-2452, I optimized some of the most significant problems outlined...

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

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 621dca799dc5ed9a61d30274acda9a8a3f3cdd22..f1a4d4856016c98dbf800e84f645defc3e7e3654 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -18,6 +18,9 @@
 #include "insetbase.h"
 #include "dimension.h"
 
+
+namespace lyx {
+
 class LColor_color;
 
 
@@ -27,22 +30,16 @@ public:
        ///
        enum {
                ///
-               TEXT_TO_INSET_OFFSET = 2
+               TEXT_TO_INSET_OFFSET = 4
        };
 
        ///
        InsetOld();
-       ///
-       int ascent() const;
-       ///
-       int descent() const;
-       ///
-       int width() const;
 
        ///
-       void setInsetName(std::string const & s) { name_ = s; }
+       void setInsetName(docstring const & s) { name_ = s; }
        ///
-       virtual std::string const & getInsetName() const { return name_; }
+       virtual docstring const & getInsetName() const { return name_; }
        ///
        virtual void setBackgroundColor(LColor_color);
        ///
@@ -53,14 +50,12 @@ public:
 protected:
        ///
        InsetOld(InsetOld const & in);
-       ///
-       mutable Dimension dim_;
 
 private:
        InsetOld & operator=(InsetOld const &) const;
 
        ///
-       std::string name_;
+       docstring name_;
        /** We store the LColor::color value as an int to get LColor.h out
         *  of the header file.
         */
@@ -79,4 +74,7 @@ public:
        operator InsetBase::Code() const { return val_; }
 };
 
+
+} // namespace lyx
+
 #endif