fix compilation pb ; update eu.po

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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 4fb9df7d97976414054f37331e1c64e5ba033a18..99f0592dd8ac7ddeedc33c058019e4e0b49bbcf0 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -18,11 +18,7 @@
 
 #include "insetbutton.h"
 #include <sigc++/signal_system.h>
-#include "support/utility.hpp"
-
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-#endif
+#include <boost/utility.hpp>
 
 // Created by Alejandro 970222
 /** Used to insert a LaTeX command automatically
@@ -50,7 +46,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 +54,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:
@@ -77,12 +73,14 @@ private:
 };
 
 
-class InsetCommand : public InsetButton, public noncopyable {
+///
+class InsetCommand : public InsetButton, boost::noncopyable {
 public:
+       ///
        explicit
        InsetCommand(InsetCommandParams const &);
        ///
-       virtual ~InsetCommand() { hide(); };
+       virtual ~InsetCommand() { hideDialog(); }
        ///
        void Write(Buffer const *, std::ostream & os) const
                { p_.Write( os ); }
@@ -95,7 +93,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;
        ///
@@ -109,9 +107,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(); }
        ///
@@ -129,7 +127,7 @@ public:
        ///
        void setParams(InsetCommandParams const &);
        ///
-       Signal0<void> hide;
+       SigC::Signal0<void> hideDialog;
 private:
        ///
        InsetCommandParams p_;