Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 03261e7862fc09b8c5d16b1d676e492ca747a27b..9924c0c7fc8139384dc13c9c196aeb4bb29c8d18 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -6,7 +6,7 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSETNOTE_H
@@ -15,17 +15,17 @@
 
 #include "insetcollapsable.h"
 
-  
+
  struct InsetNoteParams {
-       ///
-       void write(std::ostream & os) const;
-       ///
-       void read(LyXLex & lex);
-       ///
-       string type;
+       ///
+       void write(std::ostream & os) const;
+       ///
+       void read(LyXLex & lex);
+       ///
+       string type;
 };
- 
- 
+
+
 /** The PostIt note inset, and other annotations
 
 */
@@ -33,35 +33,39 @@ class InsetNote : public InsetCollapsable {
 public:
        ///
 
-       
+
        InsetNote(BufferParams const &, string const &);
        /// Copy constructor
        InsetNote(InsetNote const &);
        ///
        ~InsetNote();
        ///
-       InsetBase * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        string const editMessage() const;
        ///
-       Inset::Code lyxCode() const { return Inset::NOTE_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
        ///
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const * buf, LyXLex & lex);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
        void setButtonLabel();
        ///
        dispatch_result InsetNote::localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &,
+       void metrics(MetricsInfo &, Dimension &) const;
+       /// show the note dialog
+       bool showInsetDialog(BufferView * bv) const;
+       ///
+       int latex(Buffer const &, std::ostream &,
                        LatexRunParams const &) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool) const;
+       int docbook(Buffer const &, std::ostream &, bool) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int) const;
+       int ascii(Buffer const &, std::ostream &, int) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
@@ -87,7 +91,7 @@ public:
        ///
        virtual string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual string const inset2string(Buffer const &) const;
        ///
        static string const params2string(string const &, InsetNoteParams const &);
        ///