prepare for 1.1.6pre2

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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index bc040acd22daa6bd4ef6c0738782dfff38ec49c3..0dd010df7e26091fcac2941a69f56b0ecf041d65 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -18,7 +18,7 @@
 
 #include "insetbutton.h"
 #include <sigc++/signal_system.h>
-#include "support/utility.hpp"
+#include <boost/utility.hpp>
 
 #ifdef SIGC_CXX_NAMESPACES
 using SigC::Signal0;
@@ -50,7 +50,7 @@ public:
        ///
        void Write(std::ostream &) const;
        /// Build the complete LaTeX command
-       string getCommand() const;
+       string const getCommand() const;
        ///
        string const & getCmdName() const { return cmdname; }
        ///
@@ -58,13 +58,13 @@ public:
        ///
        string const & getContents() const { return contents; }
        ///
-       void setCmdName( string const & n ) { cmdname = n; }
+       void setCmdName( string const & n) { cmdname = n; }
        ///
        void setOptions(string const & o) { options = o; }
        ///
        void setContents(string const & c) { contents = c; }
        ///
-       string getAsString() const;
+       string const getAsString() const;
        ///
        void setFromString( string const & );
 private:
@@ -84,7 +84,7 @@ public:
        explicit
        InsetCommand(InsetCommandParams const &);
        ///
-       virtual ~InsetCommand() { hide(); };
+       virtual ~InsetCommand() { hide(); }
        ///
        void Write(Buffer const *, std::ostream & os) const
                { p_.Write( os ); }
@@ -97,7 +97,7 @@ public:
        virtual int Latex(Buffer const *, std::ostream &,
                          bool fragile, bool free_spc) const;
        ///
-       int Ascii(Buffer const *, std::ostream &) const;
+       int Ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
        virtual int Linuxdoc(Buffer const *, std::ostream &) const;
        ///
@@ -111,9 +111,9 @@ public:
          confusion with lyxinset::getLabel(int), but I've seen that
          it wasn't. I hope you never confuse again both methods.  (ale)
         */
-       virtual string getScreenLabel() const = 0;
+       virtual string const getScreenLabel() const = 0;
        ///
-       string getCommand() const { return p_.getCommand(); }
+       string const getCommand() const { return p_.getCommand(); }
        ///
        string const & getCmdName() const { return p_.getCmdName(); }
        ///