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

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

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 525febe3d054cc66c812d89683f252adaaa5c03b..90b7c0306028fdc7f447bf19d9e63dd9d945858a 100644 (file)
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -13,9 +13,8 @@
 #define INSETTEXT_H
 
 #include "Inset.h"
-#include "RowList_fwd.h"
-#include "LyXFont.h"
-#include "LyXText.h"
+#include "Font.h"
+#include "Text.h"
 
 #include "support/types.h"
 
@@ -29,7 +28,7 @@ class BufferParams;
 class BufferView;
 class CursorSlice;
 class Dimension;
-class LColor_color;
+class Color_color;
 class ParagraphList;
 
 
@@ -37,7 +36,7 @@ class ParagraphList;
  A text inset is like a TeX box to write full text
  (including styles and other insets) in a given space.
  */
-class InsetText : public InsetOld {
+class InsetText : public Inset {
 public:
        ///
        explicit InsetText(BufferParams const &);
@@ -81,7 +80,7 @@ public:
        ///
        Code lyxCode() const { return TEXT_CODE; }
        ///
-       void setText(docstring const &, LyXFont const &, bool trackChanges);
+       void setText(docstring const &, Font const &, bool trackChanges);
        ///
        void setAutoBreakRows(bool);
        ///
@@ -89,17 +88,17 @@ public:
        ///
        void setDrawFrame(bool);
        ///
-       LColor_color frameColor() const;
+       Color_color frameColor() const;
        ///
-       void setFrameColor(LColor_color);
+       void setFrameColor(Color_color);
        ///
        bool showInsetDialog(BufferView *) const;
        ///
-       LyXText * getText(int i) const {
-               return (i == 0) ? const_cast<LyXText*>(&text_) : 0;
+       Text * getText(int i) const {
+               return (i == 0) ? const_cast<Text*>(&text_) : 0;
        }
        ///
-       virtual bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+       virtual bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
        /// set the change for the entire inset
        void setChange(Change const & change);
@@ -115,9 +114,9 @@ public:
        void addPreview(graphics::PreviewLoader &) const;
 
        ///
-       void edit(LCursor & cur, bool left);
+       void edit(Cursor & cur, bool left);
        ///
-       InsetBase * editXY(LCursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y);
 
        /// number of cells in this inset
        size_t nargs() const { return 1; }
@@ -140,17 +139,17 @@ public:
 
 protected:
        ///
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 
 private:
        ///
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
        ///
        void init();
 
        ///
        bool drawFrame_;
-       /** We store the LColor::color value as an int to get LColor.h out
+       /** We store the Color::color value as an int to get Color.h out
         *  of the header file.
         */
        int frame_color_;
@@ -160,9 +159,9 @@ private:
        bool wide_inset_;
 public:
        ///
-       mutable LyXText text_;
+       mutable Text text_;
        ///
-       mutable LyXFont font_;
+       mutable Font font_;
        ///
        static int border_;
 };