Fix mis-nomer

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

diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index a6167b5dd901d46c19b4611014112736313ac96c..497f1c653a7fa71846f95ee86c7d69124d0dadad 100644 (file)
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -17,11 +17,15 @@
 #include "ExternalTemplate.h"
 
 #include "support/FileName.h"
+#include "support/unique_ptr.h"
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/signals/trackable.hpp>
+#include <boost/signals2/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
  *  and assignment operator simply call the default constructor.
@@ -29,14 +33,6 @@
  *  copy constructor and assignment operator for the
  *  InsetExternalParams class.
  */
-namespace lyx {
-
-namespace support {
-class TempFile;
-}
-
-namespace external {
-
 class TempName {
 public:
        TempName();
@@ -45,7 +41,7 @@ public:
        TempName & operator=(TempName const &);
        support::FileName operator()() const;
 private:
-       support::TempFile * tempfile_;
+       support::FileName tempname_;
 };
 
 } // namespace external
@@ -94,8 +90,11 @@ private:
 class RenderBase;
 
 ///
-class InsetExternal : public Inset, public boost::signals::trackable
+class InsetExternal : public Inset, public boost::signals2::trackable
 {
+       // 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 *);
        ///
@@ -119,7 +118,10 @@ public:
        ///
        bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
-       bool clickable(int, int) const { return true; }
+       bool clickable(BufferView const &, int, int) const { return true; }
+       ///
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype) const;
 private:
        ///
        InsetExternal(InsetExternal const &);
@@ -167,7 +169,7 @@ 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_;
 };