hopefully fix tex2lyx linking.

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

diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index f3c77eacf41f0fba657a8dfc47a49a527a97ffe2..00a69ca45555a93c3a7497babb8b329fb95a5845 100644 (file)
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -13,11 +13,13 @@
 #ifndef INSETBOX_H
 #define INSETBOX_H
 
-
 #include "insetcollapsable.h"
 #include "lyxlength.h"
+#include "mailinset.h"
 
 
+namespace lyx {
+
 class InsetBoxParams {
 public:
        ///
@@ -60,7 +62,7 @@ public:
        ///
        ~InsetBox();
        ///
-       virtual lyx::docstring const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        InsetBase::Code lyxCode() const { return InsetBase::BOX_CODE; }
        ///
@@ -78,17 +80,15 @@ public:
        ///
        bool forceDefaultParagraphs(idx_type) const;
        ///
-       bool neverIndent() const { return true; }
+       bool neverIndent(Buffer const &) const { return true; }
        ///
        bool noFontChange() const { return true; }
        ///
-       int latex(Buffer const &, lyx::odocstream &,
-                       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 &, lyx::odocstream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const & runparams) const;
        ///
        void validate(LaTeXFeatures &) const;
@@ -120,8 +120,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetBoxMailer : public MailInset {
 public:
        ///
@@ -144,4 +142,7 @@ private:
        InsetBox & inset_;
 };
 
+
+} // namespace lyx
+
 #endif // INSET_BOX_H