Andre's s/getTextClass/textClass/ cleanup.

[lyx.git] / src / insets / InsetCaption.h

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 9a95c9f378473d501af9a74b7c423150cf582df0..70894e164d717cfa2a52272c904f5d3e35749e5d 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -13,11 +13,11 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
-#include "TextClass.h"
-
 
 namespace lyx {
 
+class TextClass;
+
 /** A caption inset
 */
 class InsetCaption : public InsetText {
@@ -36,7 +36,7 @@ public:
        ///
        virtual bool neverIndent(Buffer const &) const { return true; }
        ///
-       virtual Inset::Code lyxCode() const;
+       virtual InsetCode lyxCode() const;
        ///
        virtual docstring const editMessage() const;
        ///
@@ -45,17 +45,15 @@ public:
        ///
        bool descendable() const { return true; }
        ///
-       virtual bool metrics(MetricsInfo & mi, Dimension & dim) const;
+       virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        virtual void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void drawSelection(PainterInfo & pi, int x, int y) const;
-       ///
-       virtual void edit(Cursor & cur, bool left);
+       virtual void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
        virtual Inset * editXY(Cursor & cur, int x, int y);
        ///
-       bool insetAllowed(Inset::Code code) const;
+       bool insetAllowed(InsetCode code) const;
        ///
        virtual bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
        // Update the counters of this inset and of its contents
@@ -78,17 +76,17 @@ public:
        ///
        std::string const & type() const { return type_; }
        ///
-       void setType(std::string const & type) { type_ = type; }
-       ///
        void setCustomLabel(docstring const & label);
        ///
-       void addToToc(TocList &, Buffer const &, ParConstIterator const &) const;
+       void addToToc(Buffer const &, ParConstIterator const &) const;
+       /// 
+       virtual bool forceEmptyLayout() const { return true; }
        /// Captions don't accept alignment, spacing, etc.
-       bool forceDefaultParagraphs(idx_type) const { return true; }
+       virtual bool allowParagraphCustomization(idx_type) const { return false; }
 
 private:
        ///
-       virtual std::auto_ptr<Inset> doClone() const;
+       virtual Inset * clone() const;
        ///
        mutable docstring full_label_;
        ///
@@ -110,7 +108,7 @@ Inset::DisplayType InsetCaption::display() const
 
 
 inline
-Inset::Code InsetCaption::lyxCode() const
+InsetCode InsetCaption::lyxCode() const
 {
        return CAPTION_CODE;
 }