* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 83cb528ae750e036f61999f2fc622213f94aa5d1..034f81158b8766b6c1b86a4e5babe26a08d64e29 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -13,13 +13,19 @@
 #define INSETNOTE_H
 
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
 
+namespace lyx {
 
-struct InsetNoteParams {
+class InsetNoteParams {
+public:
        enum Type {
                Note,
                Comment,
-               Greyedout
+               Greyedout,
+               Framed,
+               Shaded
        };
        /// \c type defaults to Note
        InsetNoteParams();
@@ -39,16 +45,12 @@ class InsetNote : public InsetCollapsable {
 public:
        ///
        InsetNote(BufferParams const &, std::string const &);
-       /// Copy constructor
-       InsetNote(InsetNote const &);
        ///
        ~InsetNote();
        ///
-       virtual std::auto_ptr<InsetBase> clone() const;
+       virtual docstring const editMessage() const;
        ///
-       std::string const editMessage() const;
-       ///
-       InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
+       InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
@@ -58,27 +60,26 @@ public:
        /// show the note dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
-       int latex(Buffer const &, std::ostream &,
-              OutputParams const &) const;
-       ///
-       int linuxdoc(Buffer const &, std::ostream &,
-              OutputParams const &) const;
+       int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
-              OutputParams const &) const;
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
-              OutputParams const &) const;
+       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetNoteParams const & params() const { return params_; }
+       ///
+       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 protected:
+       InsetNote(InsetNote const &);
        ///
-       virtual void priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
        friend class InsetNoteParams;
 
+       virtual std::auto_ptr<InsetBase> doClone() const;
+
        /// used by the constructors
        void init();
        ///
@@ -86,8 +87,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetNoteMailer : public MailInset {
 public:
        ///
@@ -110,4 +109,7 @@ private:
        InsetNote & inset_;
 };
 
+
+} // namespace lyx
+
 #endif