use anon namespace, somewhat better comp. handling of minipages, not quite there yet

[lyx.git] / src / graphics / GraphicsCacheItem.h

diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index 27f67f2249806810ac0cdf02abb5e0d712ba2f45..3b5c04128dc00965c684c4ef7f16e89a538ec0fb 100644 (file)
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -21,78 +21,59 @@
 #include XPM_H_LOCATION
 #include "LString.h"
 
-#include "sigc++/signal_system.h"
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-#endif
-
-
-/* (Baruch Even 2000-08-05)
- * This has a major drawback: it is only designed for X servers, no easy
- * porting to non X-server based platform is offered right now, this is done
- * in order to get a first version out of the door.
- *
- * Later versions should consider how to do this with more platform 
- * independence, this will probably involve changing the Painter class too.
- */
+#include <boost/utility.hpp>
+#include <boost/smart_ptr.hpp>
 
-class GraphicsCacheItem_pimpl;
+#include <sigc++/signal_system.h>
 
+class LyXImage;
 
 /// A GraphicsCache item holder.
-class GraphicsCacheItem {
+class GraphicsCacheItem : public boost::noncopyable {
 public:
+       /// c-tor
+       GraphicsCacheItem(string const & filename);
        /// d-tor, frees the image structures.
        ~GraphicsCacheItem();
-       /// copy c-tor.
-       GraphicsCacheItem(GraphicsCacheItem const &);
-       /// Assignment operator.
-       GraphicsCacheItem const & operator=(GraphicsCacheItem const &);
-       
-       /// Get the height of the image. Returns -1 on error.
-       int getHeight() const; 
        
-       /// Get the width of the image. Returns -1 on error.
-       int getWidth() const; 
-
        /// Return a pixmap that can be displayed on X server.
-       Pixmap getImage() const; 
-
+       LyXImage * getImage() const; 
+       ///
        enum ImageStatus {
+               ///
                Loading = 1,
+               ///
                ErrorConverting,
+               ///
                ErrorReading,
+               ///
+               UnknownError,
+               ///
                Loaded
        };
        
        /// Is the pixmap ready for display?
        ImageStatus getImageStatus() const; 
 
-       /// Get a notification when the image conversion is done.
-       /// used by an internal callback mechanism.
+       /** Get a notification when the image conversion is done.
+           used by an internal callback mechanism.
+       */
        void imageConverted(int retval);
 
-
 private:
-    /// Private c-tor so that only GraphicsCache can create an instance.
-    GraphicsCacheItem();
-
-       /// internal copy mechanism.
-       void copy(GraphicsCacheItem const &);
-       /// internal destroy mechanism.
-       void destroy();
-
-       /// Set the filename this item will be pointing too.
-       bool setFilename(string const & filename);
-
-    ///
-    friend class GraphicsCache;
-
-       GraphicsCacheItem_pimpl * pimpl;
+       bool renderXPM(string const & filename);
+       void loadXPMImage();
 
-       /// The filename we refer too, this is used when removing ourselves
-       /// from the cache.
+       /** The filename we refer too.
+           This is used when removing ourselves from the cache.
+       */
        string filename_;
+       /// The temporary file that we use
+       string tempfile;
+       /// The image status
+       ImageStatus imageStatus_;
+       /// The image (if it got loaded)
+       boost::scoped_ptr<LyXImage> image_;
 };
 
 #endif