do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiMath.cpp

diff --git a/src/frontends/qt4/GuiMath.cpp b/src/frontends/qt4/GuiMath.cpp
index 616aecd52fbb2784af4dba61d98b9a70b4da01d0..314b001c078134edb2ff0a24910c2deefb2840aa 100644 (file)
--- a/src/frontends/qt4/GuiMath.cpp
+++ b/src/frontends/qt4/GuiMath.cpp
@@ -11,17 +11,18 @@
 #include <config.h>
 
 #include "GuiMath.h"
-#include "debug.h"
+
 #include "FuncRequest.h"
 
-using std::string;
-using std::map;
+#include "support/debug.h"
+
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiMath::GuiMath(LyXView & lv, std::string const & name)
-       : GuiDialog(lv, name)
+GuiMath::GuiMath(GuiView & lv, QString const & name, QString const & title)
+       : GuiDialog(lv, name, title)
 {
        // FIXME: Ideally, those unicode codepoints would be defined
        // in "lib/symbols". Unfortunately, some of those are already
@@ -35,28 +36,28 @@ GuiMath::GuiMath(LyXView & lv, std::string const & name)
        math_symbols_["["] = MathSymbol('[');
        math_symbols_["]"] = MathSymbol(']');
        math_symbols_["|"] = MathSymbol('|');
-       math_symbols_["/"] = MathSymbol('/', 54, Font::CMSY_FAMILY);
-       math_symbols_["backslash"] = MathSymbol('\\', 110, Font::CMSY_FAMILY);
-       math_symbols_["lceil"] = MathSymbol(0x2308, 100, Font::CMSY_FAMILY);
-       math_symbols_["rceil"] = MathSymbol(0x2309, 101, Font::CMSY_FAMILY);
-       math_symbols_["lfloor"] = MathSymbol(0x230A, 98, Font::CMSY_FAMILY);
-       math_symbols_["rfloor"] = MathSymbol(0x230B, 99, Font::CMSY_FAMILY);
-       math_symbols_["langle"] = MathSymbol(0x2329, 104, Font::CMSY_FAMILY);
-       math_symbols_["rangle"] = MathSymbol(0x232A, 105, Font::CMSY_FAMILY);
-       math_symbols_["uparrow"] = MathSymbol(0x2191, 34, Font::CMSY_FAMILY);
-       math_symbols_["Uparrow"] = MathSymbol(0x21D1, 42, Font::CMSY_FAMILY);
-       math_symbols_["updownarrow"] = MathSymbol(0x2195, 108, Font::CMSY_FAMILY);
-       math_symbols_["Updownarrow"] = MathSymbol(0x21D5, 109, Font::CMSY_FAMILY);
-       math_symbols_["downarrow"] = MathSymbol(0x2193, 35, Font::CMSY_FAMILY);
-       math_symbols_["Downarrow"] = MathSymbol(0x21D3, 43, Font::CMSY_FAMILY);
-       math_symbols_["downdownarrows"] = MathSymbol(0x21CA, 184, Font::MSA_FAMILY);
-       math_symbols_["downharpoonleft"] = MathSymbol(0x21C3, 188, Font::MSA_FAMILY);
-       math_symbols_["downharpoonright"] = MathSymbol(0x21C2, 186, Font::MSA_FAMILY);
-       math_symbols_["vert"] = MathSymbol(0x007C, 106, Font::CMSY_FAMILY);
-       math_symbols_["Vert"] = MathSymbol(0x2016, 107, Font::CMSY_FAMILY);
-
-       std::map<string, MathSymbol>::const_iterator it = math_symbols_.begin();
-       std::map<string, MathSymbol>::const_iterator end = math_symbols_.end();
+       math_symbols_["/"] = MathSymbol('/', 54, CMSY_FAMILY);
+       math_symbols_["backslash"] = MathSymbol('\\', 110, CMSY_FAMILY);
+       math_symbols_["lceil"] = MathSymbol(0x2308, 100, CMSY_FAMILY);
+       math_symbols_["rceil"] = MathSymbol(0x2309, 101, CMSY_FAMILY);
+       math_symbols_["lfloor"] = MathSymbol(0x230A, 98, CMSY_FAMILY);
+       math_symbols_["rfloor"] = MathSymbol(0x230B, 99, CMSY_FAMILY);
+       math_symbols_["langle"] = MathSymbol(0x2329, 104, CMSY_FAMILY);
+       math_symbols_["rangle"] = MathSymbol(0x232A, 105, CMSY_FAMILY);
+       math_symbols_["uparrow"] = MathSymbol(0x2191, 34, CMSY_FAMILY);
+       math_symbols_["Uparrow"] = MathSymbol(0x21D1, 42, CMSY_FAMILY);
+       math_symbols_["updownarrow"] = MathSymbol(0x2195, 108, CMSY_FAMILY);
+       math_symbols_["Updownarrow"] = MathSymbol(0x21D5, 109, CMSY_FAMILY);
+       math_symbols_["downarrow"] = MathSymbol(0x2193, 35, CMSY_FAMILY);
+       math_symbols_["Downarrow"] = MathSymbol(0x21D3, 43, CMSY_FAMILY);
+       math_symbols_["downdownarrows"] = MathSymbol(0x21CA, 184, MSA_FAMILY);
+       math_symbols_["downharpoonleft"] = MathSymbol(0x21C3, 188, MSA_FAMILY);
+       math_symbols_["downharpoonright"] = MathSymbol(0x21C2, 186, MSA_FAMILY);
+       math_symbols_["vert"] = MathSymbol(0x007C, 106, CMSY_FAMILY);
+       math_symbols_["Vert"] = MathSymbol(0x2016, 107, CMSY_FAMILY);
+
+       map<string, MathSymbol>::const_iterator it = math_symbols_.begin();
+       map<string, MathSymbol>::const_iterator end = math_symbols_.end();
        for (; it != end; ++it)
                tex_names_[it->second.unicode] = it->first;
 }
@@ -137,7 +138,7 @@ MathSymbol const & GuiMath::mathSymbol(string tex_name) const
 }
 
 
-std::string const & GuiMath::texName(char_type math_symbol) const
+string const & GuiMath::texName(char_type math_symbol) const
 {
        map<char_type, string>::const_iterator it =
                tex_names_.find(math_symbol);