X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetgraphics.h;h=51ffe31ca274fdd6106ab0c4ee14c00eb876c089;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=3d3a89ea6f61cbe237a093089bcbcfa48b1af10b;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 3d3a89ea6f..51ffe31ca2 100644
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -15,10 +15,14 @@
 
 #include "inset.h"
 #include "insetgraphicsParams.h"
+#include "mailinset.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
+
+namespace lyx {
+
 class Dialogs;
 class RenderGraphic;
 class LaTeXFeatures;
@@ -31,7 +35,7 @@ public:
 	///
 	~InsetGraphics();
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	EDITABLE editable() const;
 	///
@@ -43,13 +47,13 @@ public:
 	 #fragile == true# means, that the inset should take care about
 	 fragile commands by adding a #\protect# before.
 	 */
-	int latex(Buffer const &, lyx::odocstream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, lyx::odocstream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		    OutputParams const &) const;
 
 	/** Tell LyX what the latex features you need i.e. what latex packages
@@ -92,9 +96,9 @@ private:
 	/// Create the options for the latex command.
 	std::string const createLatexOptions() const;
 	/// Create length values for docbook export.
-	std::string const toDocbookLength(LyXLength const & len) const;
+	docstring const toDocbookLength(LyXLength const & len) const;
 	/// Create the atributes for docbook export.
-	std::string const createDocBookAttributes() const;
+	docstring const createDocBookAttributes() const;
 	/// Convert the file if needed, and return the location of the file.
 	std::string const prepareFile(Buffer const & buf, OutputParams const &) const;
 
@@ -102,15 +106,13 @@ private:
 	InsetGraphicsParams params_;
 
 	/// holds the entity name that defines the graphics location (SGML).
-	std::string const graphic_label;
+	docstring const graphic_label;
 
 	/// The thing that actually draws the image on LyX's screen.
 	boost::scoped_ptr<RenderGraphic> const graphic_;
 };
 
 
-#include "mailinset.h"
-
 class InsetGraphicsMailer : public MailInset {
 public:
 	///
@@ -135,4 +137,7 @@ private:
 	InsetGraphics & inset_;
 };
 
+
+} // namespace lyx
+
 #endif