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 fe3d22ac39e492f7278eeb401949c9d40ed16dc4..f1a4d4856016c98dbf800e84f645defc3e7e3654 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -18,8 +18,10 @@
 #include "insetbase.h"
 #include "dimension.h"
 
+
+namespace lyx {
+
 class LColor_color;
-class UpdatableInset;
 
 
 /// Insets
@@ -28,52 +30,32 @@ public:
        ///
        enum {
                ///
-               TEXT_TO_INSET_OFFSET = 2
+               TEXT_TO_INSET_OFFSET = 4
        };
 
        ///
        InsetOld();
-       ///
-       InsetOld(InsetOld const & in);
-       ///
-       int ascent() const;
-       ///
-       int descent() const;
-       ///
-       int width() const;
 
        ///
-       void setInsetName(std::string const & s) { name_ = s; }
+       void setInsetName(docstring const & s) { name_ = s; }
        ///
-       std::string const & getInsetName() const { return name_; }
+       virtual docstring const & getInsetName() const { return name_; }
        ///
        virtual void setBackgroundColor(LColor_color);
        ///
        LColor_color backgroundColor() const;
        /// set x/y drawing position cache
        void setPosCache(PainterInfo const &, int, int) const;
-       ///
-       int xo() const { return xo_; }
-       ///
-       int yo() const { return yo_; }
-       /// returns the actual scroll-value
-       virtual int scroll(bool recursive = true) const;
 
-       ///
-       bool forceDefaultParagraphs(InsetBase const * inset) const;
 protected:
        ///
-       mutable int xo_;
-       ///
-       mutable int yo_;
-       ///
-       mutable int scx;
-       ///
-       mutable Dimension dim_;
+       InsetOld(InsetOld const & in);
 
 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.
         */
@@ -81,15 +63,18 @@ private:
 };
 
 
-/** \c InsetOld_code is a wrapper for InsetOld::Code.
+/** \c InsetBase_code is a wrapper for InsetBase::Code.
  *  It can be forward-declared and passed as a function argument without
  *  having to expose inset.h.
  */
-class InsetOld_code {
-       InsetOld::Code val_;
+class InsetBase_code {
+       InsetBase::Code val_;
 public:
-       InsetOld_code(InsetOld::Code val) : val_(val) {}
-       operator InsetOld::Code() const { return val_; }
+       InsetBase_code(InsetBase::Code val) : val_(val) {}
+       operator InsetBase::Code() const { return val_; }
 };
 
+
+} // namespace lyx
+
 #endif