Get rid of superfluous conversions and else statement.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27062 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-10-23 19:30:51 +00:00
parent f67069ed4d
commit 62530e98e0
2 changed files with 11 additions and 14 deletions

View File

@ -32,12 +32,11 @@ InsetMathSpecialChar::InsetMathSpecialChar(docstring name)
: name_(name), kerning_(0)
{
if (name.size() != 1) {
if (name == from_ascii("textasciicircum")
|| name == from_ascii("mathcircumflex"))
if (name == "textasciicircum" || name == "mathcircumflex")
char_ = '^';
else if (name == from_ascii("textasciitilde"))
else if (name == "textasciitilde")
char_ = '~';
else if (name == from_ascii("textbackslash"))
else if (name == "textbackslash")
char_ = '\\';
else
LASSERT(false, /**/);

View File

@ -219,17 +219,15 @@ void initSymbols()
}
bool isSpecialChar(docstring name)
bool isSpecialChar(docstring const & name)
{
if (name.size() != 1) {
string const s = to_ascii(name);
return s == "textasciicircum" || s == "mathcircumflex" ||
s == "textasciitilde" || s == "textbackslash";
} else {
char_type const c = name.at(0);
return c == '{' || c == '}' || c == '&' || c == '$' ||
c == '#' || c == '%' || c == '_';
}
if (name.size() != 1)
return name == "textasciicircum" || name == "mathcircumflex" ||
name == "textasciitilde" || name == "textbackslash";
char_type const c = name.at(0);
return c == '{' || c == '}' || c == '&' || c == '$' ||
c == '#' || c == '%' || c == '_';
}