Tiny clean-ups.

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

diff --git a/src/frontends/xforms/FormColorpicker.C b/src/frontends/xforms/FormColorpicker.C
index 77d808ea81d26b4a9758e4590badd1ee5511d3dc..92325a2be67c7d18e877817bcb93d2c981adcc02 100644 (file)
--- a/src/frontends/xforms/FormColorpicker.C
+++ b/src/frontends/xforms/FormColorpicker.C
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -13,21 +13,19 @@
 #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 {
@@ -350,7 +348,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,7 +358,7 @@ 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;