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

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

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 864225d9c137bcec89a8bc8ca1f0adce09a9d202..8eb58801b3783318a2da48e175770c6bac3fb9fb 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -5,7 +5,7 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -34,7 +34,7 @@
 
 using std::ostream;
 using std::endl;
-
+using std::auto_ptr;
 
 namespace {
 
@@ -95,7 +95,7 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
                return DISPATCHED;
        }
 
-       case LFUN_INSET_DIALOG_UPDATE: 
+       case LFUN_INSET_DIALOG_UPDATE:
                InsetWrapMailer(*this).updateDialog(cmd.view());
                return DISPATCHED;
 
@@ -107,12 +107,11 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
 
 void InsetWrapParams::write(ostream & os) const
 {
-       os << "Wrap " // getInsetName()
-          << type << '\n';
+       os << "Wrap " << type << '\n';
 
-       if (!placement.empty()) {
+       if (!placement.empty())
                os << "placement " << placement << "\n";
-       }
+
        os << "width \"" << width.asString() << "\"\n";
 }
 
@@ -146,14 +145,14 @@ void InsetWrapParams::read(LyXLex & lex)
 }
 
 
-void InsetWrap::write(Buffer const * buf, ostream & os) const
+void InsetWrap::write(Buffer const & buf, ostream & os) const
 {
        params_.write(os);
        InsetCollapsable::write(buf, os);
 }
 
 
-void InsetWrap::read(Buffer const * buf, LyXLex & lex)
+void InsetWrap::read(Buffer const & buf, LyXLex & lex)
 {
        params_.read(lex);
        InsetCollapsable::read(buf, lex);
@@ -167,9 +166,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetWrap::clone() const
+auto_ptr<InsetBase> InsetWrap::clone() const
 {
-       return new InsetWrap(*this);
+       return auto_ptr<InsetBase>(new InsetWrap(*this));
 }
 
 
@@ -179,7 +178,7 @@ string const InsetWrap::editMessage() const
 }
 
 
-int InsetWrap::latex(Buffer const * buf, ostream & os,
+int InsetWrap::latex(Buffer const & buf, ostream & os,
                     LatexRunParams const & runparams) const
 {
        os << "\\begin{floating" << params_.type << '}';
@@ -195,7 +194,7 @@ int InsetWrap::latex(Buffer const * buf, ostream & os,
 }
 
 
-int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
+int InsetWrap::docbook(Buffer const & buf, ostream & os, bool mixcont) const
 {
        os << '<' << params_.type << '>';
        int const i = inset.docbook(buf, os, mixcont);
@@ -205,7 +204,7 @@ int InsetWrap::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 }
 
 
-bool InsetWrap::insetAllowed(Inset::Code code) const
+bool InsetWrap::insetAllowed(InsetOld::Code code) const
 {
        switch(code) {
        case FLOAT_CODE:
@@ -218,26 +217,6 @@ bool InsetWrap::insetAllowed(Inset::Code code) const
 }
 
 
-int InsetWrap::getMaxWidth(BufferView * bv, UpdatableInset const * inset)
-       const
-{
-       if (owner() &&
-           static_cast<UpdatableInset*>(owner())->getMaxWidth(bv, inset) < 0) {
-               return -1;
-       }
-       if (!params_.width.zero()) {
-               int const ww1 = latexTextWidth(bv);
-               int const ww2 = InsetCollapsable::getMaxWidth(bv, inset);
-               if (ww2 > 0 && ww2 < ww1) {
-                       return ww2;
-               }
-               return ww1;
-       }
-       // this should not happen!
-       return InsetCollapsable::getMaxWidth(bv, inset);
-}
-
-
 int InsetWrap::latexTextWidth(BufferView * bv) const
 {
        return params_.width.inPixels(InsetCollapsable::latexTextWidth(bv));
@@ -254,7 +233,7 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
+void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const
 {
        // Now find the caption in the float...
        ParagraphList::iterator tmp = inset.paragraphs.begin();
@@ -262,11 +241,11 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
 
        for (; tmp != end; ++tmp) {
                if (tmp->layout()->name() == caplayout) {
-                       string const name = floatname(params_.type, buf->params);
+                       string const name = floatname(params_.type, buf.params);
                        string const str =
                                tostr(toclist[name].size() + 1)
                                + ". " + tmp->asString(buf, false);
-                       toc::TocItem const item(tmp->id(), 0 , str);
+                       lyx::toc::TocItem const item(tmp->id(), 0 , str);
                        toclist[name].push_back(item);
                }
        }
@@ -280,7 +259,7 @@ InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
 {}
 
 
-string const InsetWrapMailer::inset2string() const
+string const InsetWrapMailer::inset2string(Buffer const &) const
 {
        return params2string(inset_.params());
 }