Fix bug #12795

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

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index 6636583e6cd4d446daa1a9d05873c38944029a27..d62c751abe785bd57754cd89f2e69cf770f36ebf 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
- * \author Richard Heck (conversion to InsetCommand)
+ * \author Richard Kimberly Heck (conversion to InsetCommand)
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,14 +15,11 @@
 
 #include "InsetCommand.h"
 
-#include "RenderButton.h"
-
 #include "support/unique_ptr.h"
 
 
 namespace lyx {
 
-class BiblioInfo;
 class Buffer;
 class Dimension;
 class InsetCommandParams;
@@ -48,8 +45,9 @@ public:
 
        ///
        void setChildBuffer(Buffer * buffer);
-       /// \return the child buffer if the file is a LyX doc and could be loaded
-       Buffer * getChildBuffer() const;
+
+       /// \return loaded Buffer or zero if the file loading did not proceed.
+       Buffer * loadIfNeeded() const;
 
        /** Update the cache with all bibfiles in use of the child buffer
         *  (including bibfiles of grandchild documents).
@@ -62,51 +60,53 @@ public:
        ///
        void updateCommand();
        ///
-       void write(std::ostream &) const;
+       void write(std::ostream &) const override;
 
        /// \name Public functions inherited from Inset class
        //@{
        ///
-       void setBuffer(Buffer & buffer);
+       void setBuffer(Buffer & buffer) override;
        ///
-       bool isLabeled() const { return true; }
+       bool isLabeled() const override { return true; }
+       ///
+       bool inheritFont() const override;
        /// Override these InsetButton methods if Previewing
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const override;
        ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const override;
        ///
-       DisplayType display() const;
+       int rowFlags() const override;
        ///
-       InsetCode lyxCode() const { return INCLUDE_CODE; }
+       InsetCode lyxCode() const override { return INCLUDE_CODE; }
        ///
-       docstring layoutName() const;
+       docstring layoutName() const override;
        /** Fills \c key
         *  \param keys the list of bibkeys in the child buffer.
         *  \param it not used here
         */
-       void collectBibKeys(InsetIterator const &, support::FileNameList &) const;
+       void collectBibKeys(InsetIterator const &, support::FileNameList &) const override;
        ///
-       bool hasSettings() const { return true; }
+       bool hasSettings() const override { return true; }
        ///
-       void latex(otexstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const override;
        ///
        int plaintext(odocstringstream & ods, OutputParams const & op,
-                     size_t max_length = INT_MAX) const;
+                     size_t max_length = INT_MAX) const override;
        ///
-       int docbook(odocstream &, OutputParams const &) const;
+       void docbook(XMLStream &, OutputParams const &) const override;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const override;
        ///
-       void validate(LaTeXFeatures &) const;
+       void validate(LaTeXFeatures &) const override;
        ///
-       void addPreview(DocIterator const &, graphics::PreviewLoader &) const;
+       void addPreview(DocIterator const &, graphics::PreviewLoader &) const override;
        ///
        void addToToc(DocIterator const & di, bool output_active,
-                                 UpdateType utype, TocBackend & backend) const;
+                                 UpdateType utype, TocBackend & backend) const override;
        ///
-       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
+       void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false) override;
        ///
-       std::string contextMenuName() const;
+       std::string contextMenuName() const override;
        //@}
 
        /// \name Static public methods obligated for InsetCommand derived classes
@@ -119,7 +119,7 @@ public:
        static bool isCompatibleCommand(std::string const & s);
        ///
        bool needsCProtection(bool const maintext = false,
-                             bool const fragile = false) const;
+                             bool const fragile = false) const override;
        //@}
 
 protected:
@@ -131,8 +131,6 @@ private:
         *  and the preview should be regenerated.
         */
        void fileChanged() const;
-       /// \return loaded Buffer or zero if the file loading did not proceed.
-       Buffer * loadIfNeeded() const;
        /// launch external application
        void editIncluded(std::string const & file);
        ///
@@ -145,11 +143,11 @@ private:
 
        /// \name Private functions inherited from Inset class
        //@{
-       Inset * clone() const { return new InsetInclude(*this); }
+       Inset * clone() const override { return new InsetInclude(*this); }
        ///
-       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       void doDispatch(Cursor & cur, FuncRequest & cmd) override;
        ///
-       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
+       bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const override;
        //@}
 
        /// \name Private functions inherited from InsetCommand class
@@ -158,10 +156,10 @@ private:
        // FIXME:InsetCommmand::setParams is not virtual
        void setParams(InsetCommandParams const & params);
        /// get the text displayed on the button
-       docstring screenLabel() const;
+       docstring screenLabel() const override;
        //@}
 
-       /// holds the entity name that defines the file location (SGML)
+       /// holds the entity name that defines the file location (XML)
        docstring const include_label;
 
        /// The pointer never changes although *preview_'s contents may.
@@ -170,8 +168,6 @@ private:
        ///
        mutable bool failedtoload_;
        /// cache
-       mutable bool set_label_;
-       mutable RenderButton button_;
        mutable docstring listings_label_;
        InsetLabel * label_;
        mutable Buffer * child_buffer_;