Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C
index 0b9f8b8fd2ccb6f720afd9fb03ad695d7da0ea19..b588c23d8a78e0d417b910186eadff24cc87d34f 100644 (file)
--- a/src/frontends/xforms/FormMathsBitmap.C
+++ b/src/frontends/xforms/FormMathsBitmap.C
@@ -7,31 +7,29 @@
  * \author John Levon
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "FormMathsBitmap.h"
-#include "ControlMath.h"
-#include "xformsBC.h"
 
 #include "bmtable.h"
 #include "forms_gettext.h"
-#include "gettext.h"
-#include "support/LAssert.h"
-
-#include "lyx_xpm.h"
+#include "xformsBC.h"
 
-#include <algorithm>
+#include "ControlMath.h"
 
-extern  "C" void C_FormDialogView_CancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormDialogView_InputCB(FL_OBJECT *, long);
 
-using std::vector;
 using std::max;
+using std::vector;
+using std::string;
 
+namespace lyx {
+namespace frontend {
+
+extern  "C" void C_FormDialogView_CancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormDialogView_InputCB(FL_OBJECT *, long);
 
 FD_maths_bitmap::~FD_maths_bitmap()
 {
@@ -76,7 +74,7 @@ void FormMathsBitmap::addBitmap(BitmapStore const & bm)
 
 void FormMathsBitmap::build()
 {
-       lyx::Assert(bitmaps_.size() > 0);
+       BOOST_ASSERT(bitmaps_.size() > 0);
 
        h_+= 42; // Allow room for a Close button
 
@@ -196,3 +194,6 @@ ButtonPolicy::SMInput FormMathsBitmap::input(FL_OBJECT * ob, long)
        apply();
        return ButtonPolicy::SMI_VALID;
 }
+
+} // namespace frontend
+} // namespace lyx