Move the enum into InsetLayout.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23136 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index a3eb164d90cebef3d34c27be690e5ab67bdce3ac..67b4adcd3934d682a894f0731bea510df63477e6 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -92,7 +92,7 @@ void InsetBranch::setButtonLabel()
                        s = _("Undef: ") + s;
                }
        }
-       if (decoration() == Deco_Classic)
+       if (decoration() == InsetLayout::Classic)
                setLabel(isOpen() ? s : getNewLabel(s) );
        else
                setLabel(params_.branch + ": " + getNewLabel(s));

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 6135a63545e69494301a66ba7928e58729a98007..bc683cf8df7fbb7c37b6c21872ed74bb33bbe743 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -52,7 +52,7 @@ InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 InsetCollapsable::Geometry InsetCollapsable::geometry() const
 {
        switch (decoration()) {
-       case Deco_Classic:
+       case InsetLayout::Classic:
                if (status() == Open) {
                        if (openinlined_)
                                return LeftButton;
@@ -61,13 +61,13 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
                } else
                        return ButtonOnly;
 
-       case Deco_Minimalistic:
+       case InsetLayout::Minimalistic:
                return status() == Open ? NoButton : ButtonOnly ;
 
-       case Deco_Conglomerate:
+       case InsetLayout::Conglomerate:
                return status() == Open ? SubLabel : Corners ;
 
-       case Deco_Default:
+       case InsetLayout::Default:
                break; // this shouldn't happen
        }
 
@@ -536,7 +536,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MOUSE_RELEASE:
                if (cmd.button() == mouse_button::button3) {
                        // There is no button to right click:
-                       if (decoration() == Deco_Minimalistic ||
+                       if (decoration() == InsetLayout::Minimalistic ||
                            geometry() == Corners ||
                            geometry() == SubLabel ||
                            geometry() == NoButton
@@ -801,23 +801,23 @@ docstring InsetCollapsable::floatName(string const & type, BufferParams const &
 }
 
 
-InsetDecoration InsetCollapsable::decoration() const
+InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 {
        if (!layout_)
-               return Deco_Classic;
-       InsetDecoration const dec = layout_->decoration();
+               return InsetLayout::Classic;
+       InsetLayout::InsetDecoration const dec = layout_->decoration();
        switch (dec) {
-       case Deco_Classic:
-       case Deco_Minimalistic:
-       case Deco_Conglomerate:
+       case InsetLayout::Classic:
+       case InsetLayout::Minimalistic:
+       case InsetLayout::Conglomerate:
                return dec;
-       case Deco_Default:
+       case InsetLayout::Default:
                break;
        }
        if (lyxCode() == FLEX_CODE)
                // FIXME: Is this really necessary?
-               return Deco_Conglomerate;
-       return Deco_Classic;
+               return InsetLayout::Conglomerate;
+       return InsetLayout::Classic;
 }
 
 

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 57a089858d1eda392d57ba68629c431ca7f940a0..920a473917caecfab0c1d21085f397fd529c25c1 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -118,7 +118,7 @@ public:
         */
 
        /// Default looks
-       virtual InsetDecoration decoration() const;
+       virtual InsetLayout::InsetDecoration decoration() const;
        ///
        enum Geometry {
                TopButton,

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index b509ae5874a451a85d11e8a4182482f47dde45a8..9d5c67dfb83196823785f711e49e9eaabaa59efd 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -189,7 +189,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetERT::setButtonLabel()
 {
-       if (decoration() == Deco_Classic)
+       if (decoration() == InsetLayout::Classic)
                setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
        else
                setLabel(getNewLabel(_("ERT")));

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 1de4b1cbe29b2a9ad24671c954754a3530fd3ab0..efc8631f28a77b1bfc7fb537d818d2bfec0ef1e7 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -60,15 +60,15 @@ enum InsetLayoutTags {
 
 
 namespace {
-       InsetDecoration translateDecoration(std::string const & str) 
+       InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
        {
                if (str == "classic")
-                       return Deco_Classic;
+                       return InsetLayout::Classic;
                if (str == "minimalistic")
-                       return Deco_Minimalistic;
+                       return InsetLayout::Minimalistic;
                if (str == "conglomerate")
-                       return Deco_Conglomerate;
-               return Deco_Default;
+                       return InsetLayout::Conglomerate;
+               return InsetLayout::Default;
        }
 }
 

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 27eae62e563cf5dd25b2b0096fb05477be4c4202..4706a6d42f4612e046f2dc42511edcd77cf42f08 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -25,20 +25,19 @@ namespace lyx {
 
 class Lexer;
 
-///
-enum InsetDecoration {
-       Deco_Classic,
-       Deco_Minimalistic,
-       Deco_Conglomerate,
-       Deco_Default
-};
-
 ///
 class InsetLayout {
 public:
        ///
        InsetLayout();
        ///
+       enum InsetDecoration {
+               Classic,
+               Minimalistic,
+               Conglomerate,
+               Default
+       };
+       ///
        bool read(Lexer & lexrc);
        ///
        docstring name() const { return name_; };

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index d3deadb6242df1fc3a51a4cf5b6cef0c2fe46098..21da448d7683a4df7686d4048d310b3563937017 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -251,7 +251,7 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
 void InsetListings::setButtonLabel()
 {
        // FIXME UNICODE
-       if (decoration() == Deco_Classic)
+       if (decoration() == InsetLayout::Classic)
                setLabel(isOpen() ?  _("Listing") : getNewLabel(_("Listing")));
        else
                setLabel(getNewLabel(_("Listing")));