X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcaption.h;h=310b0e0fd1958cb33ee45ed44e01253dd09615af;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=ed4607d235be962d3d935dc75266648519f3ecde;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/insets/insetcaption.h b/src/insets/insetcaption.h
index ed4607d235..310b0e0fd1 100644
--- a/src/insets/insetcaption.h
+++ b/src/insets/insetcaption.h
@@ -16,6 +16,9 @@
 #include "insettext.h"
 #include "lyxtextclass.h"
 
+
+namespace lyx {
+
 /** A caption inset
 */
 class InsetCaption : public InsetText {
@@ -29,18 +32,18 @@ public:
 	///
 	virtual bool display() const;
 	///
-	virtual bool neverIndent() const { return true; }
+	virtual bool neverIndent(Buffer const &) const { return true; }
 	///
 	virtual InsetBase::Code lyxCode() const;
 	///
-	virtual lyx::docstring const editMessage() const;
+	virtual docstring const editMessage() const;
 	///
 	virtual void cursorPos(BufferView const & bv,
 		CursorSlice const & sl, bool boundary, int & x, int & y) const;
 	///
 	bool descendable() const { return true; }
 	///
-	virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
+	virtual bool metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	virtual void draw(PainterInfo & pi, int x, int y) const;
 	///
@@ -48,13 +51,13 @@ public:
 	///
 	virtual InsetBase * editXY(LCursor & cur, int x, int y);
 	///
-	virtual int latex(Buffer const & buf, lyx::odocstream & os,
+	virtual int latex(Buffer const & buf, odocstream & os,
 			  OutputParams const &) const;
 	///
-	int plaintext(Buffer const & buf, lyx::odocstream & os,
+	int plaintext(Buffer const & buf, odocstream & os,
 		  OutputParams const & runparams) const;
 	///
-	int docbook(Buffer const & buf, std::ostream & os,
+	int docbook(Buffer const & buf, odocstream & os,
 		    OutputParams const & runparams) const;
 	///
 	void setCount(int c) { counter_ = c; }
@@ -64,7 +67,7 @@ private:
 	///
 	virtual std::auto_ptr<InsetBase> doClone() const;
 	///
-	mutable std::string label;
+	mutable docstring label;
 	///
 	mutable int labelwidth_;
 	///
@@ -87,4 +90,7 @@ InsetBase::Code InsetCaption::lyxCode() const
 	return CAPTION_CODE;
 }
 
+
+} // namespace lyx
+
 #endif