change "support/std_sstream.h" to <sstream>

[features.git] / src / frontends / xforms / FormMathsMatrix.C

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 5a72b9f3a517d840fed41a60253d5d1b864c6726..6e02d401479151e61a84c46f7d848e89f116d105 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -8,56 +8,59 @@
  * \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 "FormMathsMatrix.h"
 #include "forms/form_maths_matrix.h"
 #include "ControlMath.h"
+
 #include "xformsBC.h"
-#include "ButtonController.h"
 
-#include "support/LAssert.h"
-#include "support/lyxalgo.h" // lyx::count
+#include "controllers/ButtonController.h"
 
-#include "Lsstream.h"
+#include "support/lyxalgo.h" // lyx::count
 
 #include "lyx_forms.h"
 
-#include <algorithm>
+#include <sstream>
+
+
+using std::ostringstream;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
 #endif
 
+namespace lyx {
+namespace frontend {
 
-static char h_align_str[80] = "c";
-static char v_align_c[] = "tcb";
-
+namespace {
 
-extern "C" {
+char h_align_str[80] = "c";
+char v_align_c[] = "tcb";
 
-       static
-       int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
-                                        char const * cur, int c)
-       {
-               lyx::Assert(ob);
-               FormMathsMatrix * pre =
-                       static_cast<FormMathsMatrix *>(ob->u_vdata);
-               lyx::Assert(pre);
-               return pre->AlignFilter(cur, c);
-       }
 
+extern "C"
+int C_FormMathsMatrixAlignFilter(FL_OBJECT * ob, char const *,
+                                char const * cur, int c)
+{
+       BOOST_ASSERT(ob);
+       FormMathsMatrix * pre =
+               static_cast<FormMathsMatrix *>(ob->u_vdata);
+       BOOST_ASSERT(pre);
+       return pre->AlignFilter(cur, c);
 }
 
+} // namespace anon
 
-typedef FormCB<ControlMathSub, FormDB<FD_maths_matrix> > base_class;
 
-FormMathsMatrix::FormMathsMatrix()
-       : base_class(_("Math Matrix"), false)
+typedef FormController<ControlMath, FormView<FD_maths_matrix> > base_class;
+
+FormMathsMatrix::FormMathsMatrix(Dialog & parent)
+       : base_class(parent, _("Math Matrix"), false)
 {}
 
 
@@ -66,7 +69,7 @@ void FormMathsMatrix::build()
        dialog_.reset(build_maths_matrix(this));
 
        fl_addto_choice(dialog_->choice_valign,
-                       _("Top | Center | Bottom").c_str());
+                       _("Top | Middle | Bottom").c_str());
        fl_set_choice(dialog_->choice_valign, 2);
        fl_set_input(dialog_->input_halign, h_align_str);
        dialog_->input_halign->u_vdata = this;
@@ -94,7 +97,7 @@ void FormMathsMatrix::apply()
 
        ostringstream os;
        os << nx << ' ' << ny << ' ' << c << ' ' << sh;
-       controller().dispatchFunc(LFUN_INSERT_MATRIX, STRCONV(os.str()));
+       controller().dispatchMatrix(os.str());
 }
 
 
@@ -127,7 +130,7 @@ int FormMathsMatrix::AlignFilter(char const * cur, int c)
 
        int const n = int(fl_get_slider_value(dialog_->slider_columns) + 0.5)
                - int(len)
-               + int(lyx::count(cur, cur + len, '|'));
+               + int(count(cur, cur + len, '|'));
        if (n < 0)
                return FL_INVALID;
 
@@ -136,3 +139,6 @@ int FormMathsMatrix::AlignFilter(char const * cur, int c)
 
        return FL_INVALID;
 }
+
+} // namespace frontend
+} // namespace lyx