X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.h;h=e8582b61fb1e6121b3dbe728bd9c8156be1194ab;hb=67e70c6c022fa445cd654937faeb87955e3bca7a;hp=64301acfeaf483ad4ee1b067610423f7b4d53d1f;hpb=040f3431e7a2350806594319704ff97a0284e9c1;p=lyx.git

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 64301acfea..e8582b61fb 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,77 +16,69 @@
 
 namespace lyx {
 
-class TextClass;
-
 /** A caption inset
 */
 class InsetCaption : public InsetText {
 public:
 	///
-	InsetCaption(InsetCaption const &);
-	InsetCaption(BufferParams const &);
+	InsetCaption(Buffer const &);
 	///
-	virtual ~InsetCaption() {}
+	std::string const & type() const { return type_; }
+	/// return the mandatory argument (LaTeX format) only
+	int getArgument(odocstream & os, OutputParams const &) const;
+	/// return the optional argument(s) only
+	int getOptArg(odocstream & os, OutputParams const &) const;
+	/// return the caption text
+	int getCaptionText(odocstream & os, OutputParams const &) const;
+private:
 	///
-	void write(Buffer const & buf, std::ostream & os) const;
+	void write(std::ostream & os) const;
 	///
-	void read(Buffer const & buf, Lexer & lex);
+	void read(Lexer & lex);
 	///
-	virtual DisplayType display() const;
+	DisplayType display() const { return AlignCenter; }
 	///
-	virtual bool neverIndent(Buffer const &) const { return true; }
+	bool neverIndent() const { return true; }
 	///
-	virtual InsetCode lyxCode() const;
+	InsetCode lyxCode() const { return CAPTION_CODE; }
 	///
-	virtual docstring const editMessage() const;
+	docstring editMessage() const;
 	///
-	virtual void cursorPos(BufferView const & bv,
+	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;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	virtual void draw(PainterInfo & pi, int x, int y) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	virtual void edit(Cursor & cur, bool front, EntryDirection entry_from);
+	void edit(Cursor & cur, bool front, EntryDirection entry_from);
 	///
-	virtual Inset * editXY(Cursor & cur, int x, int y);
+	Inset * editXY(Cursor & cur, int x, int y);
 	///
 	bool insetAllowed(InsetCode code) const;
 	///
-	virtual bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 	// Update the counters of this inset and of its contents
-	virtual void updateLabels(Buffer const &, ParIterator const &);
+	void updateLabels(ParIterator const &);
 	///
-	int latex(Buffer const & buf, odocstream & os,
-		  OutputParams const &) const;
+	int latex(odocstream & os, OutputParams const &) const;
 	///
-	int plaintext(Buffer const & buf, odocstream & os,
-		      OutputParams const & runparams) const;
+	int plaintext(odocstream & os, OutputParams const & runparams) const;
 	///
-	int docbook(Buffer const & buf, odocstream & os,
-		    OutputParams const & runparams) const;
-	/// return the mandatory argument (LaTeX format) only
-	int getArgument(Buffer const & buf, odocstream & os,
-		  OutputParams const &) const;
-	/// return the optional argument(s) only
-	int getOptArg(Buffer const & buf, odocstream & os,
-		  OutputParams const &) const;
-	///
-	std::string const & type() const { return type_; }
+	int docbook(odocstream & os, OutputParams const & runparams) const;
 	///
 	void setCustomLabel(docstring const & label);
 	///
-	void addToToc(TocList &, Buffer const &, ParConstIterator const &) const;
+	void addToToc(DocIterator const &);
 	/// 
-	virtual bool forceEmptyLayout() const { return true; }
+	virtual bool forcePlainLayout(idx_type = 0) const { return true; }
 	/// Captions don't accept alignment, spacing, etc.
-	virtual bool allowParagraphCustomization(idx_type) const { return false; }
-
-private:
+	virtual bool allowParagraphCustomization(idx_type = 0) const { return false; }
 	///
-	virtual Inset * clone() const;
+	Inset * clone() const { return new InsetCaption(*this); }
+
 	///
 	mutable docstring full_label_;
 	///
@@ -95,25 +87,9 @@ private:
 	std::string type_;
 	///
 	docstring custom_label_;
-	///
-	TextClass const & textclass_;
 };
 
 
-inline
-Inset::DisplayType InsetCaption::display() const
-{
-	return AlignCenter;
-}
-
-
-inline
-InsetCode InsetCaption::lyxCode() const
-{
-	return CAPTION_CODE;
-}
-
-
 } // namespace lyx
 
 #endif