* src/LaTeX.C: beautification: use identical user messages

[lyx.git] / src / graphics / Previews.C

diff --git a/src/graphics/Previews.C b/src/graphics/Previews.C
index 1a2dc3c1bd4253281e436ddfcd0973b68f0e729e..efbae5070ba0b55e31ece2992604577438aaff01 100644 (file)
--- a/src/graphics/Previews.C
+++ b/src/graphics/Previews.C
@@ -1,34 +1,31 @@
 /**
- *  \file Previews.C
+ * \file Previews.C
  * 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.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "Previews.h"
 #include "PreviewLoader.h"
 
 #include "buffer.h"
+#include "insetiterator.h"
 #include "lyxrc.h"
+#include "paragraph.h"
 
 #include "insets/inset.h"
 
-#include "support/LAssert.h"
 
-#include <map>
+namespace lyx {
 
-namespace grfx {
+namespace graphics {
 
-bool Previews::activated()
+LyXRC_PreviewStatus Previews::status()
 {
        return lyxrc.preview;
 }
@@ -41,7 +38,8 @@ Previews & Previews::get()
 }
 
 
-struct Previews::Impl {
+class Previews::Impl {
+public:
        ///
        typedef boost::shared_ptr<PreviewLoader> PreviewLoaderPtr;
        ///
@@ -52,7 +50,7 @@ struct Previews::Impl {
 
 
 Previews::Previews()
-       : pimpl_(new Impl())
+       : pimpl_(new Impl)
 {}
 
 
@@ -60,15 +58,13 @@ Previews::~Previews()
 {}
 
 
-PreviewLoader & Previews::loader(Buffer const * buffer) const
+PreviewLoader & Previews::loader(Buffer const & buffer) const
 {
-       lyx::Assert(buffer);
-
-       Impl::CacheType::iterator it = pimpl_->cache.find(buffer);
+       Impl::CacheType::iterator it = pimpl_->cache.find(&buffer);
 
        if (it == pimpl_->cache.end()) {
-               Impl::PreviewLoaderPtr ptr(new PreviewLoader(*buffer));
-               pimpl_->cache[buffer] = ptr;
+               Impl::PreviewLoaderPtr ptr(new PreviewLoader(buffer));
+               pimpl_->cache[&buffer] = ptr;
                return *ptr.get();
        }
 
@@ -76,12 +72,9 @@ PreviewLoader & Previews::loader(Buffer const * buffer) const
 }
 
 
-void Previews::removeLoader(Buffer const * buffer) const
+void Previews::removeLoader(Buffer const & buffer) const
 {
-       if (!buffer)
-               return;
-
-       Impl::CacheType::iterator it = pimpl_->cache.find(buffer);
+       Impl::CacheType::iterator it = pimpl_->cache.find(&buffer);
 
        if (it != pimpl_->cache.end())
                pimpl_->cache.erase(it);
@@ -90,10 +83,11 @@ void Previews::removeLoader(Buffer const * buffer) const
 
 void Previews::generateBufferPreviews(Buffer const & buffer) const
 {
-       PreviewLoader & ploader = loader(&buffer);
+       PreviewLoader & ploader = loader(buffer);
 
-       Buffer::inset_iterator it  = buffer.inset_const_iterator_begin();
-       Buffer::inset_iterator end = buffer.inset_const_iterator_end();
+       InsetBase & inset = buffer.inset();
+       InsetIterator it = inset_iterator_begin(inset);
+       InsetIterator const end = inset_iterator_end(inset);
 
        for (; it != end; ++it)
                it->addPreview(ploader);
@@ -101,4 +95,5 @@ void Previews::generateBufferPreviews(Buffer const & buffer) const
        ploader.startLoading();
 }
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx