Revert this change as it sneaked in and wasn't discussed yet.

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

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index cb0645420865dbeebd1fc408f2d99333d2fe77b0..9b5ce26375e42288b62b43a3f046c0e767ffb020 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -1,11 +1,11 @@
 // -*- C++ -*-
 /* This file is part of*
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -24,7 +24,7 @@
 /** Used to insert a LaTeX command automatically
  *
  * Similar to InsetLaTeX but having control of the basic structure of a
- *   LaTeX command: \name[options]{contents}. 
+ *   LaTeX command: \name[options]{contents}.
  */
 class InsetCommandParams {
 public:
@@ -32,7 +32,7 @@ public:
        InsetCommandParams();
        ///
        explicit
-       InsetCommandParams( string const & n,
+       InsetCommandParams(string const & n,
                            string const & c = string(),
                            string const & o = string());
        ///
@@ -40,11 +40,11 @@ public:
        ///
        bool operator!=(InsetCommandParams const &) const;
        ///
-       void Read(LyXLex &);
+       void read(LyXLex &);
        /// Parse the command
        void scanCommand(string const &);
        ///
-       void Write(std::ostream &) const;
+       void write(std::ostream &) const;
        /// Build the complete LaTeX command
        string const getCommand() const;
        ///
@@ -54,7 +54,7 @@ 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; }
        ///
@@ -62,52 +62,45 @@ public:
        ///
        string const getAsString() const;
        ///
-       void setFromString( string const & );
+       void setFromString(string const &);
 private:
-       ///    
+       ///
        string cmdname;
-       ///    
+       ///
        string contents;
-       ///    
+       ///
        string options;
 };
 
 
 ///
-class InsetCommand : public InsetButton, public boost::noncopyable {
+class InsetCommand : public InsetButton, boost::noncopyable {
 public:
        ///
        explicit
-       InsetCommand(InsetCommandParams const &);
+       InsetCommand(InsetCommandParams const &, bool same_id = false);
        ///
        virtual ~InsetCommand() { hideDialog(); }
        ///
-       void Write(Buffer const *, std::ostream & os) const
-               { p_.Write( os ); }
+       void write(Buffer const *, std::ostream & os) const
+               { p_.write(os); }
        ///
-       virtual void Read(Buffer const *, LyXLex & lex)
-               { p_.Read( lex ); }
+       virtual void read(Buffer const *, LyXLex & lex)
+               { p_.read(lex); }
        /// Can remove one InsetBibKey is modified
-       void scanCommand(string const & c) { p_.scanCommand( c ); };
-       /// 
-       virtual int Latex(Buffer const *, std::ostream &,
+       void scanCommand(string const & c) { p_.scanCommand(c); };
+       ///
+       virtual int latex(Buffer const *, std::ostream &,
                          bool fragile, bool free_spc) const;
        ///
-       int Ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       virtual int Linuxdoc(Buffer const *, std::ostream &) const;
+       virtual int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       virtual int DocBook(Buffer const *, std::ostream &) const;
+       virtual int docbook(Buffer const *, std::ostream &) const;
        ///
-       Inset::Code LyxCode() const { return Inset::NO_CODE; }
-       
-       /** Get the label that appears at screen.
-         
-         I thought it was enough to eliminate the argument to avoid
-         confusion with lyxinset::getLabel(int), but I've seen that
-         it wasn't. I hope you never confuse again both methods.  (ale)
-        */
-       virtual string const getScreenLabel() const = 0;
+       Inset::Code lyxCode() const { return Inset::NO_CODE; }
+
        ///
        string const getCommand() const { return p_.getCommand(); }
        ///
@@ -128,6 +121,7 @@ public:
        void setParams(InsetCommandParams const &);
        ///
        SigC::Signal0<void> hideDialog;
+
 private:
        ///
        InsetCommandParams p_;