Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 916126f60e3863c05e3073bdd8994b67aa977b0a..26a5beb5595ffec17b613741c82f9e7bd01a820a 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -22,27 +22,35 @@
 
 #include "controllers/ButtonController.h"
 
-#include "Lsstream.h"
+#include <sstream>
+
+using std::ostringstream;
 
 #include "delim.xbm"
 #include "delim0.xpm"
 #include "delim1.xpm"
 
+namespace lyx {
+namespace frontend {
 
-static int const delim_rversion[] = {
-1,1,3,3,4,5,7,7,9,9,10,11,
+namespace {
 
+int const delim_rversion[] = {
+       1,1,3,3,4,5,7,7,9,9,10,11,
+       3,13,15,15,16,17,19,19,20,21,22
 };
+int const delim_size =
+       sizeof(delim_rversion) / sizeof(delim_rversion[0]);
 
-
-static char const * delim_values[] = {
+char const * delim_values[] = {
        "(", ")", "lceil",  "rceil",  "uparrow",  "Uparrow",
        "[", "]", "lfloor", "rfloor", "updownarrow", "Updownarrow",
        "{", "}",  "/", "backslash",  "downarrow",  "Downarrow",
        "langle",  "rangle", "|", "Vert", ".", 0
 };
 
-using std::endl;
+
+} // namespace anon
 
 
 typedef FormController<ControlMath, FormView<FD_maths_delim> > base_class;
@@ -86,7 +94,7 @@ void FormMathsDelim::apply()
 
        ostringstream os;
        os << delim_values[left] << ' ' << delim_values[right];
-       controller().dispatchDelim(STRCONV(os.str()));
+       controller().dispatchDelim(os.str());
 }
 
 
@@ -115,7 +123,7 @@ ButtonPolicy::SMInput FormMathsDelim::input(FL_OBJECT *, long)
                        if (both) {
                                right = delim_rversion[i];
                                // Add left delimiter in "both" case if right one was pressed:
-                               for (int j = 0; j <= 23; ++j) {
+                               for (int j = 0; j < delim_size; ++j) {
                                        if (delim_rversion[j] == left) {
                                                right = left;
                                                left = j;
@@ -141,3 +149,6 @@ ButtonPolicy::SMInput FormMathsDelim::input(FL_OBJECT *, long)
 
        return ButtonPolicy::SMI_VALID;
 }
+
+} // namespace frontend
+} // namespace lyx