Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C
index a12937aca054de2e4e536ba3c6e8d01a08d6174f..e292c2ae7b08403039de3db835d91147e10e1b9b 100644 (file)
--- a/src/frontends/xforms/RadioButtonGroup.C
+++ b/src/frontends/xforms/RadioButtonGroup.C
@@ -11,29 +11,30 @@
 
 #include <config.h>
 
-
 #include "RadioButtonGroup.h"
-#include "lyx_forms.h"
+
 #include "xforms_helpers.h"
 
-#include "support/LAssert.h"
-#include "debug.h" // for lyxerr
-#include "support/lyxfunctional.h"
+#include "debug.h"
 
-#include <algorithm>
-#include <iterator>
+#include "lyx_forms.h"
+
+#include <boost/assert.hpp>
+#include <boost/bind.hpp>
 
-using namespace lyx::support;
+using boost::bind;
 
-using std::find_if;
 using std::endl;
+using std::equal_to;
 
+namespace lyx {
+namespace frontend {
 
 void RadioButtonGroup::init(FL_OBJECT * ob, size_type value)
 {
        // Object must be a ROUND3DBUTTON (let all radio buttons look the same)
        // and of type RADIO_BUTTON (otherwise it ain't work).
-       Assert(ob && ob->objclass == FL_ROUND3DBUTTON
+       BOOST_ASSERT(ob && ob->objclass == FL_ROUND3DBUTTON
                        && ob->type == FL_RADIO_BUTTON);
 
        map.push_back(ButtonValuePair(ob, value));
@@ -44,7 +45,9 @@ void RadioButtonGroup::set(size_type value) const
 {
        ButtonValueMap::const_iterator it =
                find_if(map.begin(), map.end(),
-                       lyx::equal_2nd_in_pair<ButtonValuePair>(value));
+                       bind(equal_to<size_type>(),
+                            bind(&ButtonValuePair::second, _1),
+                            value));
 
        if (it != map.end()) {
                fl_set_button(it->first, 1);
@@ -75,8 +78,8 @@ void RadioButtonGroup::set(FL_OBJECT * ob) const
 }
 
 
-template < typename T >
-struct is_set_button {
+template <typename T>
+struct is_set_button : public std::unary_function<T, bool> {
        bool operator() (T const & item) const
        {
                return fl_get_button((item).first);
@@ -99,7 +102,7 @@ void RadioButtonGroup::unset() const
 }
 
 
-RadioButtonGroup::size_type RadioButtonGroup::get() const
+size_type RadioButtonGroup::get() const
 {
        // Find the active button.
        ButtonValueMap::const_iterator it =
@@ -120,6 +123,9 @@ void RadioButtonGroup::setEnabled(bool enable)
        ButtonValueMap::iterator it  = map.begin();
        ButtonValueMap::iterator end = map.end();
        for (; it != end; ++it) {
-               ::setEnabled(it->first, enable);
+               lyx::frontend::setEnabled(it->first, enable);
        }
 }
+
+} // namespace frontend
+} // namespace lyx