Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormColorpicker.C b/src/frontends/xforms/FormColorpicker.C
index 12a755cda0b3ce26bb9eb1768f78934d008135d2..7a23f9f01ab059a4403b52d548d22ddf6eef094f 100644 (file)
--- a/src/frontends/xforms/FormColorpicker.C
+++ b/src/frontends/xforms/FormColorpicker.C
@@ -13,22 +13,21 @@
 #include "FormColorpicker.h"
 #include "forms/form_colorpicker.h"
 
-#include "xforms_resize.h"
 #include "Tooltips.h"
-#include "Color.h"
+#include "xforms_resize.h"
 
 #include "gettext.h"
 #include "lyxrc.h"
 
-#include "support/LAssert.h"
 #include "support/filetools.h" //  LibFileSearch
 #include "support/tostr.h"
 
 #include "lyx_forms.h"
 
-#include "Lsstream.h"
-#include <iomanip>
+using std::string;
 
+namespace lyx {
+namespace frontend {
 
 namespace {
 
@@ -286,7 +285,7 @@ void FormColorpicker::prepare_to_show()
 
        //  assign an icon to the form
        string const iconname =
-               lyx::support::LibFileSearch("images", "lyx", "xpm");
+               support::LibFileSearch("images", "lyx", "xpm");
 
        if (!iconname.empty()) {
                unsigned int w, h;
@@ -350,7 +349,7 @@ extern "C" {
 
 void C_FormColorpickerInputCB(FL_OBJECT * ob, long d)
 {
-       lyx::support::Assert(ob && ob->form && ob->form->u_vdata);
+       BOOST_ASSERT(ob && ob->form && ob->form->u_vdata);
        FormColorpicker * ptr =
                static_cast<FormColorpicker *>(ob->form->u_vdata);
        ptr->input(ob, d);
@@ -360,10 +359,13 @@ void C_FormColorpickerInputCB(FL_OBJECT * ob, long d)
 static int C_WMHideCB(FL_FORM * form, void *)
 {
        // Close the dialog cleanly, even if the WM is used to do so.
-       lyx::support::Assert(form && form->u_vdata);
+       BOOST_ASSERT(form && form->u_vdata);
        FormColorpicker * ptr = static_cast<FormColorpicker *>(form->u_vdata);
        ptr->input(0, 0);
        return FL_CANCEL;
 }
 
 } // extern "C"
+
+} // namespace frontend
+} // namespace lyx