cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23296 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index a246c1400ba8e590ebd8eca1d919d94480d3a0ba..99418de10446aa6917bf7c99387cedd37d37327d 100644 (file)
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -15,11 +15,8 @@
 
 #include "InsetCollapsable.h"
 
-using std::string;
-
 namespace lyx {
 
-
 /** The Flex inset, e.g., CharStyle, Custom inset or XML short element
 
 */
@@ -27,7 +24,7 @@ class InsetFlex : public InsetCollapsable {
 public:
        ///
        InsetFlex(BufferParams const &,TextClassPtr tc, 
-                       string const & layoutName);
+                       std::string const & layoutName);
        ///
        docstring name() const { return from_utf8(name_); }
 

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index d65747898869d8d0d65206268f5ed39319c893e4..7f84c9536af8f2901a97ef50aa02e0647c00974d 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -72,7 +72,7 @@ namespace {
 MathWordList theWordList;
 
 
-bool math_font_available(docstring & name)
+bool isMathFontAvailable(docstring & name)
 {
        FontInfo f;
        augmentFont(f, name);
@@ -121,7 +121,7 @@ void initSymbols()
                        is >> tmp;
                        is >> tmp;
                        docstring t = from_utf8(tmp);
-                       skip = !math_font_available(t);
+                       skip = !isMathFontAvailable(t);
                        continue;
                } else if (line.size() >= 4 && line.substr(0, 4) == "else") {
                        skip = !skip;
@@ -177,10 +177,10 @@ void initSymbols()
                        if (tmp.extra == "func" || tmp.extra == "funclim" || tmp.extra == "special") {
                                LYXERR(Debug::MATHED, "symbol abuse for " << to_utf8(tmp.name));
                                tmp.draw = tmp.name;
-                       } else if (math_font_available(tmp.inset)) {
+                       } else if (isMathFontAvailable(tmp.inset)) {
                                LYXERR(Debug::MATHED, "symbol available for " << to_utf8(tmp.name));
                                tmp.draw.push_back(char_type(charid));
-                       } else if (fallbackid && math_font_available(symbol_font)) {
+                       } else if (fallbackid && isMathFontAvailable(symbol_font)) {
                                if (tmp.inset == "cmex")
                                        tmp.inset = from_ascii("lyxsymbol");
                                else
@@ -212,7 +212,7 @@ void initSymbols()
        }
        docstring tmp = from_ascii("cmm");
        docstring tmp2 = from_ascii("cmsy");
-       has_math_fonts = math_font_available(tmp) && math_font_available(tmp2);
+       has_math_fonts = isMathFontAvailable(tmp) && isMathFontAvailable(tmp2);
 }
 
 

diff --git a/src/mathed/MathFactory.h b/src/mathed/MathFactory.h
index f62f22d980f09b26b9a419e0e44830de9b2ce0d1..fbc130cda12e50d7255e28827b910fc30f8f9ae8 100644 (file)
--- a/src/mathed/MathFactory.h
+++ b/src/mathed/MathFactory.h
@@ -12,13 +12,11 @@
 #ifndef MATH_FACTORY_H
 #define MATH_FACTORY_H
 
-#include <map>
-
 #include "MathParser.h"
 
 #include "support/strfwd.h"
 
-using std::map;
+#include <map>
 
 namespace lyx {
 
@@ -35,7 +33,7 @@ MathAtom createInsetMath(char const * const);
  */
 bool createInsetMath_fromDialogStr(docstring const &, MathData &);
 
-typedef map<docstring, latexkeys> MathWordList;
+typedef std::map<docstring, latexkeys> MathWordList;
 MathWordList const & mathedWordList();
 
 } // namespace lyx