X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlabel.h;h=f02117cbde74fa16a850ba88cc673d17aa170c60;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=6ee2e374e231f261d70ad45be2d85ff0db00f507;hpb=ccc5d5576437a7615f54bf1ed6e83e05bfbaaf78;p=lyx.git

diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h
index 6ee2e374e2..f02117cbde 100644
--- a/src/insets/insetlabel.h
+++ b/src/insets/insetlabel.h
@@ -14,37 +14,34 @@
 
 #include "insetcommand.h"
 
+
+namespace lyx {
+
 class InsetLabel : public InsetCommand {
 public:
 	///
 	InsetLabel(InsetCommandParams const &);
 	///
-	std::auto_ptr<InsetBase> clone() const;
-	///
-	std::string const getScreenLabel(Buffer const &) const;
+	docstring const getScreenLabel(Buffer const &) const;
 	///
 	EDITABLE editable() const { return IS_EDITABLE; }
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::LABEL_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::LABEL_CODE; }
 	/// Appends \c list with this label
-	void getLabelList(Buffer const &, std::vector<std::string> & list) const;
-	///
-	int latex(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	void getLabelList(Buffer const &, std::vector<docstring> & list) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
+	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
-		    OutputParams const &) const;
+	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 protected:
-	///
-	virtual
-	DispatchResult
-	priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
 };
 
+
+} // namespace lyx
+
 #endif