InsetListings: change the interface of diaplay function and allow AlignLeft. Applied...

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

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 5166d19014881ca26570be0e9c35fd37d48d282e..1ffd52a325c6ad1abd311124a28ba6ad73ea503a 100644 (file)
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -14,17 +14,17 @@
 #ifndef INSETCOLLAPSABLE_H
 #define INSETCOLLAPSABLE_H
 
-#include "InsetBase.h"
+#include "Inset.h"
 #include "InsetText.h"
 
 #include "Box.h"
-#include "LyXFont.h"
+#include "Font.h"
 
 #include <string>
 
 namespace lyx {
 
-class LyXText;
+class Text;
 class Paragraph;
 class CursorSlice;
 
@@ -44,7 +44,7 @@ public:
        ///
        InsetCollapsable(InsetCollapsable const & rhs);
        ///
-       docstring getInsetName() const { return from_ascii("Collapsable"); }
+       docstring name() const { return from_ascii("Collapsable"); }
        ///
        void read(Buffer const &, Lexer &);
        ///
@@ -71,7 +71,7 @@ public:
        ///
        virtual void setButtonLabel() {}
        ///
-       void setLabelFont(LyXFont & f);
+       void setLabelFont(Font & f);
        ///
        bool isOpen() const { return status_ == Open || status_ == Inlined; }
        ///
@@ -97,7 +97,7 @@ protected:
        ///
        void edit(Cursor & cur, bool left);
        ///
-       InsetBase * editXY(Cursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y);
        ///
        void setInlined() { status_ = Inlined; }
        ///
@@ -105,7 +105,7 @@ protected:
 
 protected:
        ///
-       LyXFont labelfont_;
+       Font labelfont_;
        ///
        mutable Box button_dim;
        ///
@@ -128,7 +128,7 @@ private:
 };
 
 // A helper function that pushes the cursor out of the inset.
-void leaveInset(Cursor & cur, InsetBase const & in);
+void leaveInset(Cursor & cur, Inset const & in);
 
 } // namespace lyx