BUG 3598: display framed and shaded notes in a separate paragraph, require package...

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

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index 93fa887e14625cce795a9b8c5d43709c7fb24eae..fcbfb9526f9d9ce0db1700629f854e87de445573 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -30,7 +30,7 @@ class RenderMonitoredPreview;
 
 
 /// for including tex/lyx files
-class InsetInclude : public InsetOld {
+class InsetInclude : public Inset {
 public:
        ///
        InsetInclude(InsetCommandParams const &);
@@ -41,13 +41,13 @@ public:
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       virtual bool display() const;
+       virtual DisplayType display() const;
 
        /// get the parameters
        InsetCommandParams const & params() const;
 
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::INCLUDE_CODE; }
+       Inset::Code lyxCode() const { return Inset::INCLUDE_CODE; }
        /** Fills \c list
         *  \param buffer the Buffer containing this inset.
         *  \param list the list of labels in the child buffer.
@@ -79,7 +79,7 @@ public:
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const &, LyXLex &);
+       void read(Buffer const &, Lexer &);
        ///
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
@@ -98,13 +98,13 @@ public:
        ///
        void updateLabels(Buffer const & buffer) const;
        ///
-       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 protected:
        InsetInclude(InsetInclude const &);
        ///
-       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;
 
        /** Slot receiving a signal that the external file has changed
         *  and the preview should be regenerated.
@@ -120,7 +120,7 @@ private:
        ///
        void write(std::ostream &) const;
        ///
-       void read(LyXLex &);
+       void read(Lexer &);
 
        /// the parameters
        InsetCommandParams params_;
@@ -141,7 +141,7 @@ public:
        ///
        InsetIncludeMailer(InsetInclude & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///