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

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

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index a44359f77a6e6518cf2f4d40ee5761789c0e9c33..33446bd11a227e1b1b330ac48ceeb5a3e46ecf1e 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -13,6 +13,10 @@
 #define INSET_LATEX_ACCENT_H
 
 #include "inset.h"
+#include "support/types.h"
+
+
+namespace lyx {
 
 class Dimension;
 
@@ -32,33 +36,26 @@ public:
        ///
        explicit InsetLatexAccent(std::string const & str);
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       int lbearing(LyXFont const & font) const;
-       ///
-       int rbearing(LyXFont const & font) const;
-       ///
        bool displayISO8859_9(PainterInfo & pi, int x, int y) const;
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
        void read(Buffer const &, LyXLex & lex);
        ///
-       int latex(Buffer const &, std::ostream &,
+       int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual int textString(Buffer const &, std::ostream & os,
+       virtual int textString(Buffer const &, odocstream &,
                OutputParams const &) const;
        ///
        bool directWrite() const;
@@ -125,7 +122,7 @@ private:
        /// Check if we know the modifier and can display it ok on screen.
        void checkContents();
        ///
-       void drawAccent(PainterInfo const & pi, int x, int y, char accent) const;
+       void drawAccent(PainterInfo const & pi, int x, int y, char_type accent) const;
        ///
        std::string contents;
        /// can display as proper char
@@ -149,4 +146,7 @@ bool InsetLatexAccent::canDisplay()
        return candisp;
 }
 
+
+} // namespace lyx
+
 #endif