Move CollapseStatus from Inset to InsetCollapsable (where it belongs IMO).

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

diff --git a/src/frontends/qt4/GuiERT.cpp b/src/frontends/qt4/GuiERT.cpp
index db846fff00d7acaaa1e12b56de6196b325fc83cd..65a6095cee2a7ddb979fdc91ed0ca8b2769d69b6 100644 (file)
--- a/src/frontends/qt4/GuiERT.cpp
+++ b/src/frontends/qt4/GuiERT.cpp
@@ -26,7 +26,7 @@ namespace lyx {
 namespace frontend {
 
 GuiERT::GuiERT(GuiView & lv)
-       : GuiDialog(lv, "ert", qt_("TeX Code Settings")), status_(InsetERT::Collapsed)
+       : GuiDialog(lv, "ert", qt_("TeX Code Settings")), status_(InsetCollapsable::Collapsed)
 {
        setupUi(this);
 
@@ -50,17 +50,17 @@ void GuiERT::change_adaptor()
 void GuiERT::applyView()
 {
        if (openRB->isChecked())
-               status_ = Inset::Open;
+               status_ = InsetCollapsable::Open;
        else
-               status_ = Inset::Collapsed;
+               status_ = InsetCollapsable::Collapsed;
 }
 
 
 void GuiERT::updateContents()
 {
        switch (status_) {
-               case InsetERT::Open: openRB->setChecked(true); break;
-               case InsetERT::Collapsed: collapsedRB->setChecked(true); break;
+               case InsetCollapsable::Open: openRB->setChecked(true); break;
+               case InsetCollapsable::Collapsed: collapsedRB->setChecked(true); break;
        }
 }
 
@@ -74,7 +74,7 @@ bool GuiERT::initialiseParams(string const & data)
 
 void GuiERT::clearParams()
 {
-       status_ = InsetERT::Collapsed;
+       status_ = InsetCollapsable::Collapsed;
 }
 
 

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 10e1f4a28c940b68aa3c35fd11963db8f405da94..e5a11df800bf43615031f11c0a3b1701f120aa76 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -501,13 +501,6 @@ public:
        virtual ColorCode backgroundColor() const;
        ///
        virtual ColorCode labelColor() const;
-       ///
-       enum CollapseStatus {
-               Collapsed,
-               Open
-       };
-       ///
-       virtual void setStatus(Cursor &, CollapseStatus) {}
        //
        enum { TEXT_TO_INSET_OFFSET = 4 };
 

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index b49b97a590f7d83e4a6fecedccfb29975a5795cb..1b30fca6aaeed815ade424b539e3b9a13df6fae8 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -42,7 +42,7 @@ using namespace std;
 namespace lyx {
 
 InsetCollapsable::InsetCollapsable(Buffer const & buf, InsetText::UsePlain ltype)
-       : InsetText(buf, ltype), status_(Inset::Open),
+       : InsetText(buf, ltype), status_(Open),
          openinlined_(false), mouse_hover_(false)
 {
        setAutoBreakRows(true);

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index b693f6bec1b57a76eb372bf4c08c686178188b45..2e3318ab74853421244512cc37454122f1ba9841 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -78,6 +78,13 @@ public:
        bool isOpen(BufferView const & bv) const 
                { return geometry(bv) != ButtonOnly; }
        ///
+       enum CollapseStatus {
+               Collapsed,
+               Open
+       };
+       ///
+       virtual void setStatus(Cursor & cur, CollapseStatus st);
+       ///
        CollapseStatus status(BufferView const & bv) const;
        /** Of the old CollapseStatus we only keep the values  
         *  Open and Collapsed.
@@ -118,8 +125,6 @@ public:
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       void setStatus(Cursor & cur, CollapseStatus st);
-       ///
        bool setMouseHover(bool mouse_hover);
        ///
        ColorCode backgroundColor() const { return getLayout().bgcolor(); }

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index 473341e52a3983777af22bc3e7913ea0bc1a9774..993562ef4b2e720506405c961dd2b5f0437d7b54 100644 (file)
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -715,7 +715,7 @@ void InsetListingsParams::write(ostream & os) const
 void InsetListingsParams::read(Lexer & lex)
 {
        lex >> inline_;
-       int s = Inset::Collapsed;
+       int s = InsetCollapsable::Collapsed;
        lex >> s;
        status_ = static_cast<InsetCollapsable::CollapseStatus>(s);
        string par;