ws changes only

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

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index f0817554454d23f4a9d33f7cbfbf856c95fb6b58..2350b9b5d78da2ff203bdbeee25c6fbc3d936d28 100644 (file)
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file insetwrap.h
  * This file is part of LyX, the document processor.
@@ -5,7 +6,7 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef InsetWrap_H
@@ -24,9 +25,9 @@ struct InsetWrapParams {
        void read(LyXLex &);
 
        ///
-       string type;
+       std::string type;
        ///
-       string placement;
+       std::string placement;
        ///
        LyXLength width;
 };
@@ -37,32 +38,32 @@ struct InsetWrapParams {
 class InsetWrap : public InsetCollapsable {
 public:
        ///
-       InsetWrap(BufferParams const &, string const &);
+       InsetWrap(BufferParams const &, std::string const &);
        ///
        ~InsetWrap();
        ///
        virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
-       void write(Buffer const * buf, std::ostream & os) const;
+       void write(Buffer const & buf, std::ostream & os) const;
        ///
-       void read(Buffer const * buf, LyXLex & lex);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       InsetBase * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Inset::Code lyxCode() const { return Inset::WRAP_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::WRAP_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
        ///
-       string const editMessage() const;
+       std::string const editMessage() const;
        ///
-       bool insetAllowed(Inset::Code) const;
+       bool insetAllowed(InsetOld::Code) const;
        ///
-       void addToToc(toc::TocList &, Buffer const *) const;
+       void addToToc(lyx::toc::TocList &, Buffer const &) const;
        ///
        bool  showInsetDialog(BufferView *) const;
        ///
@@ -86,16 +87,16 @@ public:
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string(Buffer const &) const;
+       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const &, InsetWrapParams &);
+       static void string2params(std::string const &, InsetWrapParams &);
        ///
-       static string const params2string(InsetWrapParams const &);
+       static std::string const params2string(InsetWrapParams const &);
 private:
        ///
-       static string const name_;
+       static std::string const name_;
        ///
        InsetWrap & inset_;
 };