Cleanup bv-dependent variables in InsetCollapsable

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

diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index 04f40f66a167fd3df152cf5554921837d136e9ae..39b1cbbef36ae745633b307033de70cd3d192e85 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,24 +35,23 @@ class InsetCommand : public Inset
 {
 public:
        ///
-       InsetCommand(Buffer *, InsetCommandParams const &,
-               std::string const & mailer_name);
+       InsetCommand(Buffer *, InsetCommandParams const &);
        ///
        InsetCommand(InsetCommand const & rhs);
        ///
+       InsetCommand & operator=(InsetCommand const & rhs);
+       ///
        virtual ~InsetCommand();
        ///
        InsetCommand * asInsetCommand() { return this; }
        ///
        InsetCommand const * asInsetCommand() const { return this; }
 
-
-       /// returns true if params are successfully read
-       static bool string2params(std::string const &, std::string const & name,
+       /// \return true if params are successfully read
+       static bool string2params(std::string const & data,
                                  InsetCommandParams &);
        ///
-       static std::string params2string(std::string const & name,
-                                              InsetCommandParams const &);
+       static std::string params2string(InsetCommandParams const &);
        ///
        InsetCommandParams const & params() const { return p_; }
        ///
@@ -64,12 +63,12 @@ public:
        /// FIXME Remove
        docstring const getFirstNonOptParam() const { return p_.getFirstNonOptParam(); }
 
-       /// \name Methods inherited from Inset class
+       /// \name Public functions inherited from Inset class
        //@{
        ///
        void write(std::ostream & os) const { p_.write(os); }
        ///
-       void read(Lexer & lex) { p_.read(lex); }
+       void read(Lexer & lex) { p_.Read(lex, &buffer()); }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
@@ -79,17 +78,23 @@ 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;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const & runparams) const;
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
-       bool clickable(int, int) const { return hasSettings(); }
+       bool clickable(BufferView const &, 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;
        ///
@@ -98,7 +103,7 @@ public:
        //@}
 
 protected:
-       /// \name Methods relaying to the InsetCommandParams
+       /// \name Functions relaying to the InsetCommandParams
        //@{
        /// Build the complete LaTeX command
        /// \see InsetCommandParams::getCommand
@@ -120,7 +125,7 @@ private:
        /// This should provide the text for the button
        virtual docstring screenLabel() const = 0;
 
-       /// \name Methods obligated for InsetCommand derived classes
+       /// \name Static public methods obligated for InsetCommand derived classes
        //@{
        /// Return parameter information for command cmdName.
        /// Not implemented here. Must be implemented in derived class.
@@ -135,8 +140,6 @@ private:
 
        ///
        InsetCommandParams p_;
-       ///
-       std::string mailer_name_;
        /// changes color when mouse enters/leaves this inset
        mutable std::map<BufferView const *, bool> mouse_hover_;
        ///