the AM_* flags patch

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

diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index 2bfd8a2eec938db215f2b80f67f2f1044df0639c..e55e3885e338833faea17d9070d4f2f06293b89c 100644 (file)
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -1,18 +1,19 @@
 // -*- C++ -*-
 /**
  * \file GraphicsCacheItem.h
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Baruch Even 
- * \author Angus Leeming 
+ * \author Baruch Even
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- * The graphics cache is a container of grfx::CacheItems.
- * Each grfx::CacheItem, defined here represents a separate image file.
+ * The graphics cache is a container of lyx::graphics::CacheItems.
+ * Each lyx::graphics::CacheItem, defined here represents a separate image file.
  *
  * The routines here can be used to load the graphics file into memory at
- * which point (status() == grfx::Loaded).
+ * which point (status() == lyx::graphics::Loaded).
  * The user is then free to access image() in order to copy it and to then
  * transform the copy (rotate, scale, clip) and to generate the pixmap.
  *
@@ -20,42 +21,39 @@
  * file conversion to a loadable format;
  * file loading.
  *
- * Whether you get that, of course, depends on grfx::Converter and on the
- * grfx::Image-derived image class.
+ * Whether you get that, of course, depends on lyx::graphics::Converter and
+ * on the lyx::graphics::Image-derived image class.
  */
 
 #ifndef GRAPHICSCACHEITEM_H
 #define GRAPHICSCACHEITEM_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "GraphicsTypes.h"
-#include "LString.h"
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
+
 
 class InsetGraphics;
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 class Image;
 class Converter;
 
-/// A grfx::Cache item holder.
+/// A lyx::graphics::Cache item holder.
 class CacheItem : boost::noncopyable {
 public:
        ///
-       CacheItem(string const & file);
+       CacheItem(std::string const & file);
 
        /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
        ~CacheItem();
 
        ///
-       string const & filename() const;
+       std::string const & filename() const;
 
        /// It's in the cache. Now start the loading process.
        void startLoading() const;
@@ -86,7 +84,8 @@ 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::signal<void()> sig_type;
+       typedef sig_type::slot_type slot_type;
        ///
        boost::signals::connection connect(slot_type const &) const;
 
@@ -98,6 +97,7 @@ private:
        boost::scoped_ptr<Impl> const pimpl_;
 };
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSCACHEITEM_H