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

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index 4e78a2d634..bcf337d7a0 100644
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -9,25 +9,28 @@
  * 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;
 	///
 	void read(LyXLex &);
 
 	///
-	string type;
+	std::string type;
 	///
-	string placement;
+	std::string placement;
 	///
 	LyXLength width;
 };
@@ -38,48 +41,46 @@ struct InsetWrapParams {
 class InsetWrap : public InsetCollapsable {
 public:
 	///
-	InsetWrap(BufferParams const &, string const &);
+	InsetWrap(BufferParams const &, std::string const &);
 	///
 	~InsetWrap();
 	///
-	virtual dispatch_result localDispatch(FuncRequest const & cmd);
-	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
 	void read(Buffer const & buf, LyXLex & lex);
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
+	InsetBase::Code lyxCode() const { return InsetBase::WRAP_CODE; }
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::WRAP_CODE; }
+	int latex(Buffer const &, odocstream &,
+		  OutputParams const &) const;
 	///
-	int latex(Buffer const &, std::ostream &,
-		  LatexRunParams const &) const;
+	int docbook(Buffer const &, odocstream &,
+		    OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+	virtual docstring const editMessage() const;
 	///
-	string const editMessage() const;
+	bool insetAllowed(InsetBase::Code) const;
 	///
-	bool insetAllowed(InsetOld::Code) const;
+	void addToToc(TocList &, Buffer const &) const;
 	///
-	void addToToc(lyx::toc::TocList &, Buffer const &) const;
+	bool showInsetDialog(BufferView *) const;
 	///
-	bool  showInsetDialog(BufferView *) const;
+	InsetWrapParams const & params() const { return params_; }
 	///
-	int latexTextWidth(BufferView *) const;
+	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+protected:
 	///
-	InsetWrapParams const & params() const { return params_; }
+	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:
 	///
@@ -87,18 +88,21 @@ public:
 	///
 	virtual InsetBase & inset() const { return inset_; }
 	///
-	virtual string const & name() const { return name_; }
+	virtual std::string const & name() const { return name_; }
 	///
-	virtual string const inset2string(Buffer const &) const;
+	virtual std::string const inset2string(Buffer const &) const;
 	///
-	static void string2params(string const &, InsetWrapParams &);
+	static void string2params(std::string const &, InsetWrapParams &);
 	///
-	static string const params2string(InsetWrapParams const &);
+	static std::string const params2string(InsetWrapParams const &);
 private:
 	///
-	static string const name_;
+	static std::string const name_;
 	///
 	InsetWrap & inset_;
 };
 
+
+} // namespace lyx
+
 #endif