X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetwrap.h;h=bcf337d7a086d63f509008af942768785f6ee056;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=94adbb1c20ac9dad7aa7e12f4b5c949adfa4df0f;hpb=87ca6fbbeb83fa95310789e6d692e43cbfcdb6f5;p=lyx.git

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index 94adbb1c20..bcf337d7a0 100644
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -9,16 +9,19 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef InsetWrap_H
-#define InsetWrap_H
-
+#ifndef INSETWRAP_H
+#define INSETWRAP_H
 
 #include "insetcollapsable.h"
-#include "toc.h"
 #include "lyxlength.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 
-struct InsetWrapParams {
+class InsetWrapParams {
+public:
 	///
 	void write(std::ostream &) const;
 	///
@@ -48,41 +51,36 @@ public:
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
-	InsetOld::Code lyxCode() const { return InsetOld::WRAP_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::WRAP_CODE; }
 	///
-	int latex(Buffer const &, std::ostream &,
-		  LatexRunParams const &) const;
+	int latex(Buffer const &, odocstream &,
+		  OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+	int docbook(Buffer const &, odocstream &,
+		    OutputParams const &) const;
 	///
-	std::string const editMessage() const;
+	virtual docstring const editMessage() const;
 	///
-	bool insetAllowed(InsetOld::Code) const;
+	bool insetAllowed(InsetBase::Code) const;
 	///
-	void addToToc(lyx::toc::TocList &, Buffer const &) const;
+	void addToToc(TocList &, Buffer const &) const;
 	///
-	bool  showInsetDialog(BufferView *) const;
-	///
-	int latexTextWidth(BufferView *) const;
+	bool showInsetDialog(BufferView *) const;
 	///
 	InsetWrapParams const & params() const { return params_; }
+	///
+	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 protected:
 	///
-	virtual
-	dispatch_result
-	priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	///
 	InsetWrapParams params_;
 };
 
 
-
-#include "mailinset.h"
-
-
 class InsetWrapMailer : public MailInset {
 public:
 	///
@@ -104,4 +102,7 @@ private:
 	InsetWrap & inset_;
 };
 
+
+} // namespace lyx
+
 #endif