Make it compile when USE_BOOST_FORMAT is unset

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index ac446c7ca5cb45edb8714f0608891e35f6eae1ab..e25a92d007e00113f70aac15de4c8e2c9427aef1 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -1,15 +1,14 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 the LyX Team.
+/**
+ * \file insetgraphics.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss <voss@lyx.org>
- * ====================================================== */
+ * \author Herbert Voss
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
@@ -17,24 +16,27 @@
 
 #ifdef __GNUG__
 #pragma interface
-#endif 
+#endif
 
-#include "graphics/GraphicsTypes.h"
 #include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
+
 // We need a signal here to hide an active dialog when we are deleted.
-#include "sigc++/signal_system.h"
+#include <boost/signals/signal0.hpp>
+#include <boost/signals/trackable.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class Dialogs;
 class LaTeXFeatures;
 
 ///
-class InsetGraphics : public Inset, public SigC::Object {
+class InsetGraphics : public Inset, public boost::signals::trackable {
 public:
        ///
        InsetGraphics();
        ///
-       InsetGraphics(InsetGraphics const &, bool same_id = false);
+       InsetGraphics(InsetGraphics const &, string const & filepath,
+                     bool same_id = false);
        ///
        ~InsetGraphics();
        ///
@@ -46,7 +48,7 @@ public:
        ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
-       void edit(BufferView *, int, int, unsigned int);
+       void edit(BufferView *, int, int, mouse_button::state);
        ///
        void edit(BufferView * bv, bool front = true);
        ///
@@ -61,13 +63,13 @@ public:
         fragile commands by adding a #\protect# before.
         */
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 bool fragile, bool free_spc) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
        int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
@@ -83,7 +85,8 @@ public:
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
        */
-       bool setParams(InsetGraphicsParams const & params);
+       bool setParams(InsetGraphicsParams const & params,
+                      string const & filepath);
 
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
@@ -91,21 +94,20 @@ public:
        /** This signal is connected by our dialog and called when the inset
            is deleted.
        */
-       SigC::Signal0<void> hideDialog;
+       boost::signal0<void> hideDialog;
 
 private:
-       /// Set the cached variables
-       void setCache() const;
        /// Is the image ready to draw, or should we display a message instead?
-       bool drawImage() const;
+       bool imageIsDrawable() const;
+
+       /** This method is connected to cache_->statusChanged, so we are
+           informed when the image has been loaded.
+        */
+       void statusChanged();
 
        /// Read the inset native format
-       void readInsetGraphics(Buffer const * buf, LyXLex & lex);
-       /// Read the FigInset file format
-       void readFigInset(Buffer const * buf, LyXLex & lex);
-       
-       /// Update the inset after parameter change.
-       void updateInset() const;
+       void readInsetGraphics(LyXLex & lex);
+
        /// Get the status message, depends on the image loading status.
        string const statusMessage() const;
        /// Create the options for the latex command.
@@ -120,13 +122,10 @@ private:
        string const graphic_label;
 
        /// The cached variables
-       mutable grfx::ImageStatus cached_status_;
-       ///
-       mutable grfx::ImagePtr cached_image_;
-       ///
-       mutable bool cache_filled_;
-       ///
-       mutable int old_asc;
+       class Cache;
+       friend class Cache;
+       /// The pointer never changes although *cache_'s contents may.
+       boost::scoped_ptr<Cache> const cache_;
 };
 
-#endif 
+#endif