Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormMathsBitmap.h b/src/frontends/xforms/FormMathsBitmap.h
index 8272ba0f26b0293c320bb27a1000d60e77dc48c6..77e4e33b19dbcac2cd3b2a4bce32eb12583620de 100644 (file)
--- a/src/frontends/xforms/FormMathsBitmap.h
+++ b/src/frontends/xforms/FormMathsBitmap.h
@@ -14,11 +14,11 @@
 #ifndef FORM_MATHSBITMAP_H
 #define FORM_MATHSBITMAP_H
 
-
 #include "FormDialogView.h"
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
+namespace lyx {
+namespace frontend {
 
 struct BitmapStore
 {
@@ -56,7 +56,7 @@ class FormMathsBitmap
        : public FormController<ControlMath, FormView<FD_maths_bitmap> > {
 public:
        ///
-       FormMathsBitmap(Dialog &, string const &, std::vector<string> const &);
+       FormMathsBitmap(Dialog &, std::string const &, std::vector<std::string> const &);
        ///
        void addBitmap(BitmapStore const &);
 
@@ -77,9 +77,9 @@ private:
        FL_OBJECT * buildBitmap(BitmapStore const & bmstore);
 
        /// The latex names associated with each symbol
-       std::vector<string> latex_;
+       std::vector<std::string> latex_;
        /// The latex name chosen
-       string latex_chosen_;
+       std::string latex_chosen_;
 
        /** Temporary store for bitmap data passed to addBitmap()
         *  but before the FL_OBJECT is created in build().
@@ -98,5 +98,7 @@ private:
        int h_;
 };
 
+} // namespace frontend
+} // namespace lyx
 
 #endif // FORM_MATHSBITMAP_H