Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / xformsImage.C

diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C
index 1646ea034a2758d7674d6f8bc6f1b738a8d922af..493f5357269bd14e13f24cfa9d027a5096d8b08c 100644 (file)
--- a/src/frontends/xforms/xformsImage.C
+++ b/src/frontends/xforms/xformsImage.C
@@ -20,7 +20,6 @@
 #include "graphics/GraphicsParams.h"
 
 #include "support/lstrings.h"
-#include "support/lyxfunctional.h"  // compare_memfun
 #include "support/lyxlib.h"
 
 #include "lyx_forms.h"
@@ -33,13 +32,20 @@
 # endif
 #endif
 
+#include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
+using lyx::frontend::getRGBColor;
+
 using lyx::support::float_equal;
 using lyx::support::prefixIs;
 using lyx::support::rtrim;
 
+using boost::bind;
+
+using std::equal_to;
 using std::find_if;
+using std::string;
 
 
 namespace {
@@ -101,7 +107,9 @@ Image::FormatList xformsImage::loadableFormats()
 
                Formats::const_iterator it =
                        find_if(begin, end,
-                               lyx::compare_memfun(&Format::extension, ext));
+                               bind(equal_to<string>(),
+                                    bind(&Format::extension, _1),
+                                    ext));
                if (it != end)
                        fmts.push_back(it->name());
        }
@@ -468,7 +476,7 @@ unsigned int packedcolor(LColor::color col)
        bool const success = getRGBColor(col, r, g, b);
        if (!success)
                // Set to black on failure
-               return FL_PACK(255,255,255);
+               return FL_PACK(255, 255, 255);
 
        return FL_PACK(r, g, b);
 }