Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn...

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

diff --git a/src/insets/InsetIndex.h b/src/insets/InsetIndex.h
index 642d3ee0dce16bb902fd22bf1df1d48e1e34957b..26d4fc5e32b15dcb74efa5d1b1a3c7e8ba50dc15 100644 (file)
--- a/src/insets/InsetIndex.h
+++ b/src/insets/InsetIndex.h
@@ -58,9 +58,8 @@ private:
        void read(Lexer & lex);
        ///
        int docbook(odocstream &, OutputParams const &) const;
-       /// At the moment, this does nothing. See development/HTML.notes
-       /// for some remarks on what could be done.
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       /// 
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        int latex(odocstream &, OutputParams const &) const;
        ///
@@ -74,13 +73,13 @@ private:
        ///
        void addToToc(DocIterator const &);
        ///
-       docstring const buttonLabel(BufferView const & bv) const;
-       ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
+       ///
+       docstring const buttonLabel(BufferView const & bv) const;
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///
-       docstring contextMenu(BufferView const & bv, int x, int y) const;
+       docstring contextMenuName() const;
        ///
        Inset * clone() const { return new InsetIndex(*this); }
 
@@ -95,37 +94,51 @@ class InsetPrintIndex : public InsetCommand {
 public:
        ///
        InsetPrintIndex(Buffer * buf, InsetCommandParams const &);
-       ///
-       InsetCode lyxCode() const { return INDEX_PRINT_CODE; }
 
+       /// \name Public functions inherited from Inset class
+       //@{
        ///
-       static ParamInfo const & findInfo(std::string const &);
-       ///
-       static std::string defaultCommand() { return "printindex"; };
-       ///
-       static bool isCompatibleCommand(std::string const & s);
+       InsetCode lyxCode() const { return INDEX_PRINT_CODE; }
        ///
        int latex(odocstream &, OutputParams const &) const;
-       /// Does nothing yet.
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       /// 
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
-       virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
-private:
+       docstring contextMenuName() const;
        /// Updates needed features for this inset.
        void validate(LaTeXFeatures & features) const;
        ///
        bool hasSettings() const;
-
        ///
        DisplayType display() const { return AlignCenter; }
+       //@}
+
+       /// \name Static public methods obligated for InsetCommand derived classes
+       //@{
        ///
-       docstring screenLabel() const;
+       static ParamInfo const & findInfo(std::string const &);
+       ///
+       static std::string defaultCommand() { return "printindex"; }
+       ///
+       static bool isCompatibleCommand(std::string const & s);
+       //@}
+
+private:
+       /// \name Private functions inherited from Inset class
+       //@{
        ///
        Inset * clone() const { return new InsetPrintIndex(*this); }
+       //@}
+
+       /// \name Private functions inherited from InsetCommand class
+       //@{
+       ///
+       docstring screenLabel() const;
+       //@}
 };