reformatting and remove using delc

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 52d0da7a3a827e58181e48e03d4dbe2a531931d3..96df55fd29f9e6ec069cb18a5616c39f1b1c9b04 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -20,27 +20,18 @@
 #include "insets/lyxinset.h"
 #include "insets/insetgraphicsParams.h"
 #include "graphics/GraphicsCacheItem.h"
+#include <boost/smart_ptr.hpp>
 
 #include "LaTeXFeatures.h"
 
 // We need a signal here to hide an active dialog when we are deleted.
 #include "sigc++/signal_system.h"
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-using SigC::slot;
-using SigC::Object;
-#endif 
 
 class Dialogs;
 class LyXImage;
 
 ///
-#ifdef SIGC_CXX_NAMESPACES
-class InsetGraphics : public Inset, public SigC::Object
-#else
-class InsetGraphics : public Inset, public Object
-#endif
-{
+class InsetGraphics : public Inset, public SigC::Object {
 public:
        ///
        InsetGraphics();
@@ -100,7 +91,8 @@ public:
        /** This signal is connected by our dialog and called when the inset
            is deleted.
        */
-       Signal0 <void> hide;
+       SigC::Signal0<void> hideDialog;
+
 private:
        /// Update the inset after parameter change.
        void updateInset() const;
@@ -112,12 +104,10 @@ private:
        string const prepareFile(Buffer const * buf) const;
 
        /// The graphics cache handle.
-       mutable GraphicsCacheItem * cacheHandle;
+       mutable boost::shared_ptr<GraphicsCacheItem> cacheHandle;
 
-       /// The pixmap
-       mutable LyXImage * pixmap;
        /// is the pixmap initialized?
-       mutable bool updateImage;
+       mutable bool imageLoaded;
 
        InsetGraphicsParams params;
 };