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 7095f9c7832370f63552f109a6dc1f41c6a2e37c..9b5ce26375e42288b62b43a3f046c0e767ffb020 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of*
- * ====================================================== 
+ * ======================================================
  *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
  *           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());
        ///
@@ -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,13 +62,13 @@ public:
        ///
        string const getAsString() const;
        ///
-       void setFromString( string const & );
+       void setFromString(string const &);
 private:
-       ///    
+       ///
        string cmdname;
-       ///    
+       ///
        string contents;
-       ///    
+       ///
        string options;
 };
 
@@ -78,18 +78,18 @@ 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 ); }
+               { p_.write(os); }
        ///
        virtual void read(Buffer const *, LyXLex & lex)
-               { p_.read( lex ); }
+               { p_.read(lex); }
        /// Can remove one InsetBibKey is modified
-       void scanCommand(string const & c) { p_.scanCommand( c ); };
-       /// 
+       void scanCommand(string const & c) { p_.scanCommand(c); };
+       ///
        virtual int latex(Buffer const *, std::ostream &,
                          bool fragile, bool free_spc) const;
        ///
@@ -97,17 +97,10 @@ public:
        ///
        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;
+
        ///
        string const getCommand() const { return p_.getCommand(); }
        ///
@@ -128,6 +121,7 @@ public:
        void setParams(InsetCommandParams const &);
        ///
        SigC::Signal0<void> hideDialog;
+
 private:
        ///
        InsetCommandParams p_;