Enable convertDefault.sh to run even if its executable bit is not set.

[lyx.git] / src / insets / insetminipage.C

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index c87d4beca7ccd68690405dad970eb0e6cc4317ce..ecf9ed6d81d7f6fc050ba69e24f608eb6b810fa0 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -6,7 +6,7 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -76,16 +76,7 @@ InsetMinipage::InsetMinipage(BufferParams const & bp)
 #if 0
        setAutoCollapse(false);
 #endif
-
-#if 0
-#ifdef WITH_WARNINGS
-#warning Remove this color definitions before 1.2.0 final!
-#endif
-       // just for experimentation :)
-       setBackgroundColor(LColor::green);
-#endif
-
-       inset.setFrameColor(0, LColor::blue);
+       inset.setFrameColor(LColor::blue);
        setInsetName("Minipage");
 }
 
@@ -103,8 +94,7 @@ auto_ptr<InsetBase> InsetMinipage::clone() const
 
 InsetMinipage::~InsetMinipage()
 {
-       InsetMinipageMailer mailer(*this);
-       mailer.hideDialog();
+       InsetMinipageMailer(*this).hideDialog();
 }
 
 
@@ -202,14 +192,14 @@ void InsetMinipage::Params::read(LyXLex & lex)
 }
 
 
-void InsetMinipage::write(Buffer const * buf, ostream & os) const
+void InsetMinipage::write(Buffer const & buf, ostream & os) const
 {
        params_.write(os);
        InsetCollapsable::write(buf, os);
 }
 
 
-void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
+void InsetMinipage::read(Buffer const & buf, LyXLex & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
@@ -251,7 +241,7 @@ string const InsetMinipage::editMessage() const
 }
 
 
-int InsetMinipage::latex(Buffer const * buf, ostream & os,
+int InsetMinipage::latex(Buffer const & buf, ostream & os,
                         LatexRunParams const & runparams) const
 {
        string s_pos;
@@ -276,9 +266,9 @@ int InsetMinipage::latex(Buffer const * buf, ostream & os,
 }
 
 
-bool InsetMinipage::insetAllowed(Inset::Code code) const
+bool InsetMinipage::insetAllowed(InsetOld::Code code) const
 {
-       if (code == Inset::FLOAT_CODE || code == Inset::MARGIN_CODE)
+       if (code == InsetOld::FLOAT_CODE || code == InsetOld::MARGIN_CODE)
                return false;
 
        return InsetCollapsable::insetAllowed(code);