revert last patch. there's something wrong, possibly unrelated to this

[lyx.git] / src / mathed / MathSupport.cpp

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index a01b9294ae8eba9e832b5be036dc4e867b790f5f..d1831d4432203050ff4b22c04c0e2456b5d18c13 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -11,30 +11,29 @@
 
 #include <config.h>
 
+#include "MathSupport.h"
+
 #include "InsetMath.h"
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
-#include "MathSupport.h"
-
-#include "debug.h"
 
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+
 #include <map>
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
 using frontend::Painter;
 
-using std::max;
-using std::endl;
-using std::vector;
-
 
 ///
 class Matrix {
@@ -339,7 +338,7 @@ named_deco_struct deco_table[] = {
 };
 
 
-std::map<docstring, deco_struct> deco_list;
+map<docstring, deco_struct> deco_list;
 
 // sort the table on startup
 class init_deco_table {
@@ -360,7 +359,7 @@ static init_deco_table dummy;
 
 deco_struct const * search_deco(docstring const & name)
 {
-       std::map<docstring, deco_struct>::const_iterator p = deco_list.find(name);
+       map<docstring, deco_struct>::const_iterator p = deco_list.find(name);
        return p == deco_list.end() ? 0 : &(p->second);
 }
 
@@ -499,7 +498,7 @@ void math_font_max_dim(FontInfo const & font, int & asc, int & des)
 
 
 struct fontinfo {
-       std::string cmd_;
+       string cmd_;
        FontFamily family_;
        FontSeries series_;
        FontShape  shape_;
@@ -605,7 +604,7 @@ fontinfo * lookupFont(docstring const & name0)
 {
        //lyxerr << "searching font '" << name << "'" << endl;
        int const n = sizeof(fontinfos) / sizeof(fontinfo);
-       std::string name = to_utf8(name0);
+       string name = to_utf8(name0);
        for (int i = 0; i < n; ++i)
                if (fontinfos[i].cmd_ == name) {
                        //lyxerr << "found '" << i << "'" << endl;