Remove unused variable warning and remove preprocessor switch.

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

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index f270acd7e7397a7c73b0eda20fba9dfbb8da2d47..a90bd9696357f6f37d69366322cac949652a35c7 100644 (file)
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -1,14 +1,14 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsLoader.h
+ * \file GraphicsLoader.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming 
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  The public face of the graphics cache.
+ * The public face of the graphics cache.
  *
  *  * The user supplies an image file and the display parameters.
  *  * He can change the file or the display parameters through a reset() method.
@@ -18,26 +18,21 @@
  *  * When (status() == Ready), he can use image() to access the loaded image
  *    and pass it to the Painter.
  *
- *  What could be simpler?
+ * What could be simpler?
  */
 
 #ifndef GRAPHICSLOADER_H
 #define GRAPHICSLOADER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "GraphicsTypes.h"
-#include "LString.h"
 
-#include <boost/signals/signal0.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <boost/signals2.hpp>
+
+namespace lyx {
 
-class Inset;
-class BufferView;
+namespace support { class FileName; }
 
-namespace grfx {
+namespace graphics {
 
 class Image;
 class Params;
@@ -47,33 +42,35 @@ public:
        /// Must use the reset methods to make this instance usable.
        Loader();
        /// The image is not transformed, just displayed as-is.
-       Loader(string const & file_with_path, DisplayType = ColorDisplay);
+       Loader(support::FileName const & file_with_path, bool display = true);
        /// The image is transformed before display.
-       Loader(string const & file_with_path, Params const &);
-
-       /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
+       Loader(support::FileName const & file_with_path, Params const &);
+       ///
+       Loader(Loader const &);
+       /// Needed for the pimpl
        ~Loader();
 
+       Loader & operator=(Loader const &);
+
        /// The file can be changed, or the display params, or both.
-       void reset(string const & file_with_path,
-                  DisplayType = ColorDisplay) const;
+       void reset(support::FileName const & file_with_path, bool display = true) const;
        ///
-       void reset(string const & file_with_path, Params const &) const;
+       void reset(support::FileName const & file_with_path, Params const &) const;
        ///
        void reset(Params const &) const;
 
        /// Returns the absolute path of the loaded (loading?) file.
-       string const & filename() const;
+       support::FileName const & filename() const;
        ///
-       bool empty() const { return filename().empty(); }
 
-       /// We are explicit about when we begin the loading process.
+       /** starting loading of the image is done by a urgency-based
+        *  decision. Here we only call LoaderQueue::touch to request it.
+        */
        void startLoading() const;
 
-       /** starting loading of the image is conditional upon the
-        *  inset being visible or not.
+       /** Tries to reload the image. 
         */
-       void startLoading(Inset const &, BufferView const &) const;
+       void reload() const;
 
        /** Monitor any changes to the file.
         *  There is no point monitoring the file before startLoading() is
@@ -82,7 +79,7 @@ public:
        void startMonitoring() const;
        ///
        bool monitoring() const;
-       /** Returns the check sum of filename() so that, for example, you can
+       /** Returns the check checksum of filename() so that, for example, you can
         *  ascertain whether to output a new PostScript version of the file
         *  for a LaTeX run.
         */
@@ -94,22 +91,27 @@ public:
        /** Connect and you'll be informed when the loading status of the image
         *  changes.
         */
-       typedef boost::signal0<void>::slot_type slot_type;
+       typedef boost::signals2::signal<void()> sig_type;
+       typedef sig_type::slot_type slot_type;
        ///
-       boost::signals::connection connect(slot_type const &) const;
+       boost::signals2::connection connect(slot_type const &) const;
 
        /** The loaded image with Pixmap set.
         *  If the Pixmap is not yet set (see status() for why...), returns 0.
         */
        Image const * image() const;
 
+       double displayPixelRatio() const;
+       void setDisplayPixelRatio(double scale);
+
 private:
        /// Use the Pimpl idiom to hide the internals.
        class Impl;
        /// The pointer never changes although *pimpl_'s contents may.
-       boost::scoped_ptr<Impl> const pimpl_;
+       Impl * const pimpl_;
 };
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSLOADER_H