remove unneeded conversions

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

diff --git a/src/frontends/qt4/validators.C b/src/frontends/qt4/validators.C
index 871a0326d06ff3d9e32bc240358e0ef3d2357c0b..349298960c8d4efb3b24ad774fbc7460addd58c2 100644 (file)
--- a/src/frontends/qt4/validators.C
+++ b/src/frontends/qt4/validators.C
@@ -112,8 +112,8 @@ docstring const printable_list(docstring const & invalid_chars)
 
        for (; it != end; ++it) {
                if (it != begin)
-                       s += lyx::from_ascii(", ");
-               if (*it == lyx::char_type(' '))
+                       s += ", ";
+               if (*it == ' ')
                        s += _("space");
                else
                        s += *it;
@@ -135,7 +135,7 @@ QValidator::State PathValidator::validate(QString & qtext, int &) const
                return  acceptable_if_empty_ ?
                        QValidator::Acceptable : QValidator::Intermediate;
 
-       docstring invalid_chars = lyx::from_ascii("#$%{}()[]\"^");
+       docstring invalid_chars = from_ascii("#$%{}()[]\"^");
        if (!tex_allows_spaces_)
                invalid_chars += ' ';
 

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 924fae7cc360c3cf760f183dd98c0fd7c8767770..71e825483d993d742b959592f9816dc27229d15b 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -822,12 +822,12 @@ void LyXTextClass::readCounter(LyXLex & lexrc)
                switch (static_cast<CounterTags>(le)) {
                case CT_NAME:
                        lexrc.next();
-                       name = lyx::from_ascii(lexrc.getString());
+                       name = from_ascii(lexrc.getString());
                        break;
                case CT_WITHIN:
                        lexrc.next();
-                       within = lyx::from_ascii(lexrc.getString());
-                       if (within == lyx::from_ascii("none"))
+                       within = from_ascii(lexrc.getString());
+                       if (within == "none")
                                within.erase();
                        break;
                case CT_END: