Clean up DeclareDocBookClass

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

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index d73e353f4c72979c145bc69367c4c3fe1e655f98..e3daaa770415d24a563f650cc3fd2819b8b3ec24 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -319,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,
@@ -375,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;
@@ -439,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.