tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 373e469fa3135e537b8d1393f1958ecab41ea88e..4d5066e33fac5ed34c627d5feaea042a65fce593 100644 (file)
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -16,11 +16,11 @@
 #include "Inset.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
-#include "Cursor.h"
 
 
 namespace lyx {
 
+class Cursor;
 
 /////////////////////////////////////////////////////////////////////////
 //
@@ -35,8 +35,7 @@ class InsetCommand : public Inset
 {
 public:
        ///
-       InsetCommand(Buffer *, InsetCommandParams const &,
-               std::string const & mailer_name);
+       InsetCommand(Buffer *, InsetCommandParams const &);
        ///
        InsetCommand(InsetCommand const & rhs);
        ///
@@ -77,7 +76,7 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -86,8 +85,13 @@ public:
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
        bool clickable(int, int) const { return hasSettings(); }
+       //@}
+
+protected:
+       /// \name Methods relaying to the InsetCommandParams p_
+       //@{
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       std::string contextMenuName() const;
        ///
        bool showInsetDialog(BufferView * bv) const;
        ///
@@ -133,8 +137,6 @@ private:
 
        ///
        InsetCommandParams p_;
-       ///
-       std::string mailer_name_;
        /// changes color when mouse enters/leaves this inset
        mutable std::map<BufferView const *, bool> mouse_hover_;
        ///