Revert r27129. We can't get rid of these until we have something else positive to do.

[lyx.git] / src / insets / InsetCollapsable.cpp

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index b72816c7193a08f55fa0d6b2be8d7256af457e33..84eb4e319b21c822e8e90adf5226743953f51774 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -46,7 +46,7 @@ namespace lyx {
 
 InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 {
-       if (decoration() == InsetLayout::Conglomerate)
+       if (decoration() == InsetLayout::CONGLOMERATE)
                return status_;
        return autoOpen_ ? Open : status_;
 }
@@ -55,18 +55,18 @@ InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 InsetCollapsable::Geometry InsetCollapsable::geometry() const
 {
        switch (decoration()) {
-       case InsetLayout::Classic:
+       case InsetLayout::CLASSIC:
                if (status() == Open)
                        return openinlined_ ? LeftButton : TopButton;
                return ButtonOnly;
 
-       case InsetLayout::Minimalistic:
+       case InsetLayout::MINIMALISTIC:
                return status() == Open ? NoButton : ButtonOnly ;
 
-       case InsetLayout::Conglomerate:
+       case InsetLayout::CONGLOMERATE:
                return status() == Open ? SubLabel : Corners ;
 
-       case InsetLayout::Default:
+       case InsetLayout::DEFAULT:
                break; // this shouldn't happen
        }
 
@@ -76,9 +76,8 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 }
 
 
-InsetCollapsable::InsetCollapsable(Buffer const & buf,
-               CollapseStatus status)
-       : InsetText(buf), status_(status),
+InsetCollapsable::InsetCollapsable(Buffer const & buf)
+       : InsetText(buf), status_(Inset::Open),
          openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
        DocumentClass const & dc = buf.params().documentClass();
@@ -86,7 +85,7 @@ InsetCollapsable::InsetCollapsable(Buffer const & buf,
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
-       paragraphs().back().setLayout(dc.plainLayout());
+       paragraphs().back().setLayout(dc.plainLayout()); 
 }
 
 
@@ -755,19 +754,19 @@ docstring InsetCollapsable::floatName(
 InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 {
        if (!layout_)
-               return InsetLayout::Classic;
+               return InsetLayout::CLASSIC;
        InsetLayout::InsetDecoration const dec = layout_->decoration();
        switch (dec) {
-       case InsetLayout::Classic:
-       case InsetLayout::Minimalistic:
-       case InsetLayout::Conglomerate:
+       case InsetLayout::CLASSIC:
+       case InsetLayout::MINIMALISTIC:
+       case InsetLayout::CONGLOMERATE:
                return dec;
-       case InsetLayout::Default:
+       case InsetLayout::DEFAULT:
                break;
        }
        if (lyxCode() == FLEX_CODE)
-               return InsetLayout::Conglomerate;
-       return InsetLayout::Classic;
+               return InsetLayout::CONGLOMERATE;
+       return InsetLayout::CLASSIC;
 }
 
 
@@ -785,7 +784,7 @@ int InsetCollapsable::latex(odocstream & os,
        // collapsable insets should not redefine this, non-standard ones may
        // call this.
        if (!layout_->latexname().empty()) {
-               if (layout_->latextype() == "command") {
+               if (layout_->latextype() == InsetLayout::COMMAND) {
                        // FIXME UNICODE
                        if (runparams.moving_arg)
                                os << "\\protect";
@@ -793,7 +792,7 @@ int InsetCollapsable::latex(odocstream & os,
                        if (!layout_->latexparam().empty())
                                os << from_utf8(layout_->latexparam());
                        os << '{';
-               } else if (layout_->latextype() == "environment") {
+               } else if (layout_->latextype() == InsetLayout::ENVIRONMENT) {
                        os << "%\n\\begin{" << from_utf8(layout_->latexname()) << "}\n";
                        if (!layout_->latexparam().empty())
                                os << from_utf8(layout_->latexparam());
@@ -806,9 +805,9 @@ int InsetCollapsable::latex(odocstream & os,
                rp.moving_arg = true;
        int i = InsetText::latex(os, rp);
        if (!layout_->latexname().empty()) {
-               if (layout_->latextype() == "command") {
+               if (layout_->latextype() == InsetLayout::COMMAND) {
                        os << "}";
-               } else if (layout_->latextype() == "environment") {
+               } else if (layout_->latextype() == InsetLayout::ENVIRONMENT) {
                        os << "\n\\end{" << from_utf8(layout_->latexname()) << "}\n";
                        i += 4;
                }
@@ -837,7 +836,7 @@ bool InsetCollapsable::undefined() const
 docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
        int y) const
 {
-       if (decoration() == InsetLayout::Conglomerate)
+       if (decoration() == InsetLayout::CONGLOMERATE)
                return from_ascii("context-conglomerate");
 
        if (geometry() == NoButton)