X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.h;h=a6f6a05a1b4eee6822098524aa0bf22c7bb17ddd;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=be38ca8cf18ecc98e2fe28ccc8363da2e3d59731;hpb=282f86fbb1ec7a877cdd05f25edbf468ae06595d;p=lyx.git diff --git a/src/insets/inset.h b/src/insets/inset.h index be38ca8cf1..a6f6a05a1b 100644 --- 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,7 +30,7 @@ public: /// enum { /// - TEXT_TO_INSET_OFFSET = 2 + TEXT_TO_INSET_OFFSET = 4 }; /// @@ -40,9 +43,9 @@ public: 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); /// @@ -53,14 +56,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 +80,7 @@ public: operator InsetBase::Code() const { return val_; } }; + +} // namespace lyx + #endif