X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetExternal.h;h=420550f924c0748a31a4bee5291856715cbcdd37;hb=9da29ac7884158580a01f068952adef73ae11883;hp=c1adb2b12a4ff552100e60bcade925de4d53b109;hpb=82c7e15e6444a8566a9b7b8053b830d03058383e;p=lyx.git

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index c1adb2b12a..420550f924 100644
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -13,15 +13,16 @@
 #define INSET_EXTERNAL_H
 
 #include "Inset.h"
+
 #include "ExternalTemplate.h"
-#include "ExternalTransforms.h"
 
 #include "support/FileName.h"
-#include "support/Translator.h"
+#include "support/unique_ptr.h"
+
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/signals/trackable.hpp>
+namespace lyx {
 
+namespace external {
 
 /** No two InsetExternalParams variables can have the same temporary file.
  *  This class has copy-semantics but the copy constructor
@@ -30,17 +31,13 @@
  *  copy constructor and assignment operator for the
  *  InsetExternalParams class.
  */
-namespace lyx {
-
-namespace external {
-
 class TempName {
 public:
 	TempName();
 	TempName(TempName const &);
 	~TempName();
 	TempName & operator=(TempName const &);
-	support::FileName const & operator()() const { return tempname_; }
+	support::FileName operator()() const;
 private:
 	support::FileName tempname_;
 };
@@ -57,7 +54,7 @@ public:
 	bool read(Buffer const &, Lexer &);
 
 	/// The name of the tempfile used for manipulations.
-	support::FileName const & tempname() const { return tempname_(); }
+	support::FileName tempname() const { return tempname_(); }
 
 	/// The template currently in use.
 	void settemplate(std::string const &);
@@ -91,8 +88,11 @@ private:
 class RenderBase;
 
 ///
-class InsetExternal : public Inset, public boost::signals::trackable
+class InsetExternal : public Inset
 {
+	// Disable assignment operator, since it is not used, and it is too
+	// complicated to implement it consistently with the copy constructor
+	InsetExternal & operator=(InsetExternal const &);
 public:
 	InsetExternal(Buffer *);
 	///
@@ -110,10 +110,16 @@ public:
 	/// Update not loaded previews
 	void updatePreview();
 	/// \returns the number of rows (\n's) of generated code.
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
-
+	std::string contextMenuName() const;
+	///
+	bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
+	///
+	bool clickable(BufferView const &, int, int) const { return true; }
+	///
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype, TocBackend & backend) const;
 private:
 	///
 	InsetExternal(InsetExternal const &);
@@ -130,16 +136,17 @@ private:
 	///
 	void read(Lexer & lex);
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	/// For now, this does nothing. Someone who knows about this
 	/// should see what needs doing for XHTML output.
-	docstring xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	/// Update needed features for this inset.
 	void validate(LaTeXFeatures & features) const;
 	///
-	void addPreview(graphics::PreviewLoader &) const;
+	void addPreview(DocIterator const &, graphics::PreviewLoader &) const;
 	///
 	bool showInsetDialog(BufferView * bv) const;
 	///
@@ -160,7 +167,9 @@ private:
 	/// The current params
 	InsetExternalParams params_;
 	/// The thing that actually draws the image on LyX's screen.
-	boost::scoped_ptr<RenderBase> renderer_;
+	unique_ptr<RenderBase> renderer_;
+	/// changes color of the button when mouse enters/leaves this inset
+	mutable std::map<BufferView const *, bool> mouse_hover_;
 };
 
 } // namespace lyx