InsetListings: change the interface of diaplay function and allow AlignLeft. Applied...

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

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index b60e1d059d788d69b4a757f4e1c908d56f0b6f4c..a1525146a9615cbd21a5ee514edaa2ea2f9f7bff 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -17,7 +17,7 @@
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
 #include "MailInset.h"
-#include "LCursor.h"
+#include "Cursor.h"
 
 
 namespace lyx {
@@ -31,7 +31,7 @@ namespace lyx {
  */
 
 ///
-class InsetCommand : public InsetOld {
+class InsetCommand : public Inset {
 public:
        ///
        InsetCommand(InsetCommandParams const &, std::string const & mailer_name);
@@ -45,7 +45,7 @@ public:
        void write(Buffer const &, std::ostream & os) const
                { p_.write(os); }
        ///
-       virtual void read(Buffer const &, LyXLex & lex)
+       virtual void read(Buffer const &, Lexer & lex)
                { p_.read(lex); }
        ///
        int latex(Buffer const &, odocstream &, OutputParams const &) const;
@@ -54,7 +54,7 @@ public:
        ///
        int docbook(Buffer const &, odocstream &, OutputParams const & runparams) const;
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::NO_CODE; }
+       Inset::Code lyxCode() const { return Inset::NO_CODE; }
 
        ///
        InsetCommandParams const & params() const { return p_; }
@@ -88,9 +88,9 @@ public:
 
 protected:
        ///
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
        ///
        docstring const getCommand() const { return p_.getCommand(); }
        ///
@@ -109,10 +109,13 @@ protected:
 private:
        ///
        InsetCommandParams p_;
+       ///
        std::string mailer_name_;
        /// changes color when mouse enters/leaves this inset
        bool mouse_hover_;
+       ///
        mutable bool updateButtonLabel_;
+       ///
        mutable RenderButton button_;
 };
 
@@ -122,7 +125,7 @@ public:
        ///
        InsetCommandMailer(std::string const & name, InsetCommand & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///