X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetexternal.h;h=2e33880a20132fb3bb492464c2f6da0b2c9c1128;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=fefcc2a840063066bb0b954be2c6688a53d682fc;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index fefcc2a840..2e33880a20 100644
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -21,6 +21,8 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
+#include "mailinset.h"
+
 
 /** No two InsetExternalParams variables can have the same temporary file.
  *  This class has copy-semantics but the copy constructor
@@ -30,6 +32,7 @@
  *  InsetExternalParams class.
  */
 namespace lyx {
+
 namespace external {
 
 class TempName {
@@ -38,9 +41,9 @@ public:
 	TempName(TempName const &);
 	~TempName();
 	TempName & operator=(TempName const &);
-	std::string const & operator()() const { return tempname_; }
+	support::FileName const & operator()() const { return tempname_; }
 private:
-	std::string tempname_;
+	support::FileName tempname_;
 };
 
 /// How is the image to be displayed on the LyX screen?
@@ -58,7 +61,6 @@ enum DisplayType {
 Translator<DisplayType, std::string> const & displayTranslator();
 
 } // namespace external
-} // namespace lyx
 
 
 /// hold parameters settable from the GUI
@@ -70,23 +72,23 @@ public:
 	bool read(Buffer const &, LyXLex &);
 
 	/// The name of the tempfile used for manipulations.
-	std::string const & tempname() const { return tempname_(); }
+	support::FileName const & tempname() const { return tempname_(); }
 
 	/// The template currently in use.
 	void settemplate(std::string const &);
 	std::string const & templatename() const { return templatename_; }
 
 	/// The external file.
-	lyx::support::FileName filename;
+	support::DocFileName filename;
 	/// How the inset is to be displayed by LyX.
-	lyx::external::DisplayType display;
+	external::DisplayType display;
 	/// The scale of the displayed graphic (if shown).
 	unsigned int lyxscale;
 
-	lyx::external::ClipData     clipdata;
-	lyx::external::ExtraData    extradata;
-	lyx::external::ResizeData   resizedata;
-	lyx::external::RotationData rotationdata;
+	external::ClipData     clipdata;
+	external::ExtraData    extradata;
+	external::ResizeData   resizedata;
+	external::RotationData rotationdata;
 
 	/** if \c true, simply output the filename, maybe wrapped in a
 	 *  box, rather than generate and display the image etc.
@@ -94,7 +96,7 @@ public:
 	bool draft;
 
 private:
-	lyx::external::TempName tempname_;
+	external::TempName tempname_;
 	std::string templatename_;
 };
 
@@ -114,7 +116,7 @@ public:
 	virtual EDITABLE editable() const { return IS_EDITABLE; }
 
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
@@ -123,13 +125,13 @@ public:
 	virtual void read(Buffer const &, LyXLex & lex);
 
 	/// \returns the number of rows (\n's) of generated code.
-	virtual int latex(Buffer const &, lyx::odocstream &,
+	virtual int latex(Buffer const &, odocstream &,
 			  OutputParams const &) const;
 	///
-	virtual int plaintext(Buffer const &, lyx::odocstream &,
+	virtual int plaintext(Buffer const &, odocstream &,
 			  OutputParams const &) const;
 	///
-	virtual int docbook(Buffer const &, std::ostream &,
+	virtual int docbook(Buffer const &, odocstream &,
 			    OutputParams const &) const;
 
 	/// Update needed features for this inset.
@@ -140,7 +142,7 @@ public:
 	///
 	void setParams(InsetExternalParams const &, Buffer const &);
 	///
-	void addPreview(lyx::graphics::PreviewLoader &) const;
+	void addPreview(graphics::PreviewLoader &) const;
 	///
 	void edit(LCursor & cur, bool left);
 	///
@@ -170,8 +172,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetExternalMailer : public MailInset {
 public:
 	///
@@ -195,4 +195,6 @@ private:
 	InsetExternal & inset_;
 };
 
+} // namespace lyx
+
 #endif