Clean up DeclareDocBookClass

[lyx.git] / src / graphics / PreviewLoader.cpp

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 76f634c3b27040eccc94753c192c2085ec24772d..e3daaa770415d24a563f650cc3fd2819b8b3ec24 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -126,7 +126,7 @@ void setAscentFractions(vector<double> & ascent_fractions,
 
 std::function <bool (SnippetPair const &)> FindFirst(string const & comp)
 {
-       return [comp](SnippetPair const & sp) { return sp.first == comp; };
+       return [&comp](SnippetPair const & sp) { return sp.first == comp; };
 }
 
 
@@ -229,12 +229,13 @@ private:
        ///
        QTimer * delay_refresh_;
        ///
+       Trackable trackable_;
+       ///
        bool finished_generating_;
 
        /// We don't own this
        static lyx::Converter const * pconverter_;
 
-       Trackable trackable_;
 };
 
 
@@ -318,18 +319,26 @@ Buffer const & PreviewLoader::buffer() const
 
 namespace {
 
-std::function<SnippetPair (string const &)> IncrementedFileName
-       (string const & to_format, string const & filename_base)
-{
-       return [to_format, filename_base](string const & snippet)
+class IncrementedFileName {
+public:
+       IncrementedFileName(string const & to_format,
+                           string const & filename_base)
+               : to_format_(to_format), base_(filename_base), counter_(1)
+       {}
+
+       SnippetPair const operator()(string const & snippet)
        {
-               static int counter_ = 1;
                ostringstream os;
-               os << filename_base << counter_++ << '.' << to_format;
-               string const file = os.str();
-               return make_pair(snippet, FileName(file));
-       };
-}
+               os << base_ << counter_++ << '.' << to_format_;
+               string const file_name = os.str();
+               return make_pair(snippet, FileName(file_name));
+       }
+       
+private:
+       string const & to_format_;
+       string const & base_;
+       int counter_;
+};
 
 
 InProgress::InProgress(string const & filename_base,
@@ -374,8 +383,8 @@ PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
 {
        font_scaling_factor_ = int(buffer_.fontScalingFactor());
        if (theApp()) {
-               fg_color_ = strtol(theApp()->hexName(foregroundColor()).c_str(), nullptr, 16);
-               bg_color_ = strtol(theApp()->hexName(backgroundColor()).c_str(), nullptr, 16);
+               fg_color_ = convert(theApp()->hexName(foregroundColor()).c_str(), 16);
+               bg_color_ = convert(theApp()->hexName(backgroundColor()).c_str(), 16);
        } else {
                fg_color_ = 0x0;
                bg_color_ = 0xffffff;
@@ -438,8 +447,8 @@ PreviewLoader::Impl::preview(string const & latex_snippet) const
        int fg = 0x0;
        int bg = 0xffffff;
        if (theApp()) {
-               fg = strtol(theApp()->hexName(foregroundColor()).c_str(), nullptr, 16);
-               bg = strtol(theApp()->hexName(backgroundColor()).c_str(), nullptr, 16);
+               fg = convert(theApp()->hexName(foregroundColor()).c_str(), 16);
+               bg = convert(theApp()->hexName(backgroundColor()).c_str(), 16);
        }
        if (font_scaling_factor_ != fs || fg_color_ != fg || bg_color_ != bg) {
                // Schedule refresh of all previews on zoom or color changes.
@@ -452,6 +461,7 @@ PreviewLoader::Impl::preview(string const & latex_snippet) const
        // Don't try to access the cache until we are done.
        if (delay_refresh_->isActive() || !finished_generating_)
                return nullptr;
+
        Cache::const_iterator it = cache_.find(latex_snippet);
        return (it == cache_.end()) ? nullptr : it->second.get();
 }
@@ -478,7 +488,7 @@ namespace {
 
 std::function<bool (InProgressProcess const &)> FindSnippet(string const & s)
 {
-       return [s](InProgressProcess const & process) {
+       return [&s](InProgressProcess const & process) {
                BitmapFile const & snippets = process.second.snippets;
                BitmapFile::const_iterator beg  = snippets.begin();
                BitmapFile::const_iterator end = snippets.end();
@@ -531,7 +541,7 @@ void PreviewLoader::Impl::add(string const & latex_snippet)
 namespace {
 
 std::function<void (InProgressProcess &)> EraseSnippet(string const & s) {
-       return [s](InProgressProcess & process) {
+       return [&s](InProgressProcess & process) {
                BitmapFile & snippets = process.second.snippets;
                BitmapFile::iterator it  = snippets.begin();
                BitmapFile::iterator end = snippets.end();