* In the process of fixing the math background color bug, this commit transfer backgr...

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

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 65eee42452baae91e2d3b3054bf827292fa324e3..8267e1b6cd248ecdd914e5c4a187a01b0b92160b 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -17,6 +17,8 @@
 #include "render_button.h"
 #include "mailinset.h"
 
+#include "support/filename.h"
+
 #include <boost/scoped_ptr.hpp>
 
 namespace lyx {
@@ -35,7 +37,7 @@ public:
        ~InsetInclude();
 
        /// Override these InsetButton methods if Previewing
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -57,7 +59,7 @@ public:
         *  \param keys the list of bibkeys in the child buffer.
         */
        void fillWithBibKeys(Buffer const & buffer,
-               std::vector<std::pair<std::string,std::string> > & keys) const;
+               std::vector<std::pair<std::string, docstring> > & keys) const;
        /** Update the cache with all bibfiles in use of the child buffer
         *  (including bibfiles of grandchild documents).
         *  Does nothing if the child document is not loaded to prevent
@@ -70,7 +72,7 @@ public:
         *  Return an empty vector if the child doc is not loaded.
         *  \param buffer the Buffer containing this inset.
         */
-       std::vector<std::string> const &
+       std::vector<support::FileName> const &
        getBibfilesCache(Buffer const & buffer) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
@@ -80,13 +82,13 @@ public:
        void read(Buffer const &, LyXLex &);
        ///
        int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                 OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-           OutputParams const &) const;
+                   OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///