requires is a keyword in C++2a

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

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index 5270f2bfa9f9497109e510de965719fafaa9cda7..be4a31773ada009df95bac9eedfcfbaa50fd3f6b 100644 (file)
--- a/src/insets/InsetGraphics.h
+++ b/src/insets/InsetGraphics.h
@@ -34,7 +34,7 @@ class InsetGraphics : public Inset
 {
 public:
        ///
-       InsetGraphics(Buffer * buf);
+       explicit InsetGraphics(Buffer * buf);
        ///
        ~InsetGraphics();
 
@@ -54,14 +54,15 @@ public:
        InsetGraphicsParams getParams() const { return params_;}
        ///
        bool clickable(BufferView const &, int, int) const { return true; }
-
-private:
        ///
-       InsetGraphics(InsetGraphics const &);
+       bool canPaintChange(BufferView const &) const { return true; }
+       ///
+       InsetGraphics * asInsetGraphics() { return this; }
+       /// 
+       InsetGraphics const * asInsetGraphics() const { return this; }
 
        ///
        bool isLabeled() const { return true; }
-       void metrics(MetricsInfo &, Dimension &) const;
        ///
        bool hasSettings() const { return true; }
        ///
@@ -90,6 +91,18 @@ private:
        docstring layoutName() const { return from_ascii("Graphics"); }
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
+
+       ///
+       int topOffset(BufferView const *) const { return 0; }
+       ///
+       int bottomOffset(BufferView const *) const { return 0; }
+       ///
+       int leftOffset(BufferView const *) const { return 0; }
+       ///
+       int rightOffset(BufferView const *) const { return 0; }
+
+       ///
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -100,19 +113,21 @@ private:
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
        void addToToc(DocIterator const & di, bool output_active,
-                                 UpdateType utype) const;
+                                 UpdateType utype, TocBackend & backend) const;
        ///
        std::string contextMenuName() const;
        /// Force inset into LTR environment if surroundings are RTL
-       bool forceLTR() const { return true; }
+       bool forceLTR(OutputParams const &) const { return true; }
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        Inset * clone() const;
        /// Get the status message, depends on the image loading status.
        std::string statusMessage() const;
+       /// Get the output bounding box accounting for raster formats.
+       void outBoundingBox(graphics::BoundingBox &) const;
        /// Create the options for the latex command.
-       std::string createLatexOptions() const;
+       std::string createLatexOptions(bool const ps) const;
        /// Create length values for docbook export.
        docstring toDocbookLength(Length const & len) const;
        /// Create the atributes for docbook export.
@@ -125,6 +140,12 @@ private:
        /// \return the new filename, relative to the location of the HTML file,
        /// or an empty string on error.
        std::string prepareHTMLFile(OutputParams const & runparams) const;
+       ///
+       OutputParams::CtObject CtObject(OutputParams const &) const { return OutputParams::CT_OBJECT; }
+
+private:
+       ///
+       InsetGraphics(InsetGraphics const &);
 
        ///
        InsetGraphicsParams params_;
@@ -153,7 +174,7 @@ namespace graphics {
        void unifyGraphicsGroups(Buffer &, std::string const &);
        InsetGraphics * getCurrentGraphicsInset(Cursor const &);
 
-}
+} // namespace graphics
 
 } // namespace lyx