mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
remove unneeded conversions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16370 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
22ee485a26
commit
ea2c007320
@ -112,8 +112,8 @@ docstring const printable_list(docstring const & invalid_chars)
|
|||||||
|
|
||||||
for (; it != end; ++it) {
|
for (; it != end; ++it) {
|
||||||
if (it != begin)
|
if (it != begin)
|
||||||
s += lyx::from_ascii(", ");
|
s += ", ";
|
||||||
if (*it == lyx::char_type(' '))
|
if (*it == ' ')
|
||||||
s += _("space");
|
s += _("space");
|
||||||
else
|
else
|
||||||
s += *it;
|
s += *it;
|
||||||
@ -135,7 +135,7 @@ QValidator::State PathValidator::validate(QString & qtext, int &) const
|
|||||||
return acceptable_if_empty_ ?
|
return acceptable_if_empty_ ?
|
||||||
QValidator::Acceptable : QValidator::Intermediate;
|
QValidator::Acceptable : QValidator::Intermediate;
|
||||||
|
|
||||||
docstring invalid_chars = lyx::from_ascii("#$%{}()[]\"^");
|
docstring invalid_chars = from_ascii("#$%{}()[]\"^");
|
||||||
if (!tex_allows_spaces_)
|
if (!tex_allows_spaces_)
|
||||||
invalid_chars += ' ';
|
invalid_chars += ' ';
|
||||||
|
|
||||||
|
@ -822,12 +822,12 @@ void LyXTextClass::readCounter(LyXLex & lexrc)
|
|||||||
switch (static_cast<CounterTags>(le)) {
|
switch (static_cast<CounterTags>(le)) {
|
||||||
case CT_NAME:
|
case CT_NAME:
|
||||||
lexrc.next();
|
lexrc.next();
|
||||||
name = lyx::from_ascii(lexrc.getString());
|
name = from_ascii(lexrc.getString());
|
||||||
break;
|
break;
|
||||||
case CT_WITHIN:
|
case CT_WITHIN:
|
||||||
lexrc.next();
|
lexrc.next();
|
||||||
within = lyx::from_ascii(lexrc.getString());
|
within = from_ascii(lexrc.getString());
|
||||||
if (within == lyx::from_ascii("none"))
|
if (within == "none")
|
||||||
within.erase();
|
within.erase();
|
||||||
break;
|
break;
|
||||||
case CT_END:
|
case CT_END:
|
||||||
|
Loading…
Reference in New Issue
Block a user