From ea2c00732063904b466be5709fe46a152ac6b82a Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 21 Dec 2006 19:02:17 +0000 Subject: [PATCH] remove unneeded conversions git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16370 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/validators.C | 6 +++--- src/lyxtextclass.C | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontends/qt4/validators.C b/src/frontends/qt4/validators.C index 871a0326d0..349298960c 100644 --- 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 924fae7cc3..71e825483d 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -822,12 +822,12 @@ void LyXTextClass::readCounter(LyXLex & lexrc) switch (static_cast(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: -- 2.39.2