summaryrefslogtreecommitdiff
path: root/src/script/api
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-03 14:19:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-03 17:30:21 +0200
commit406402dc639db7f5d785961717326467026fb6f1 (patch)
tree5cb396ddbeefbf917b767fc8d9cdf9516bf13f1d /src/script/api
parentf98e56356b932388b8e6da0802c6225710511709 (diff)
downloadqtscript-406402dc639db7f5d785961717326467026fb6f1.tar.gz
Change uses of {to,from}Ascii to {to,from}Latin1
This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I4f44512856ea99112d8eb6d341d6058c1fc439dc Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/script/api')
-rw-r--r--src/script/api/qscriptvalue.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index d73405e..45e164c 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -333,7 +333,7 @@ QScriptValue::QScriptValue(QScriptEngine *engine, const char *val)
JSC::ExecState *exec = d_ptr->engine->currentFrame;
d_ptr->initFrom(JSC::jsString(exec, val));
} else {
- d_ptr->initFrom(QString::fromAscii(val));
+ d_ptr->initFrom(QString::fromLatin1(val));
}
}
#endif
@@ -432,7 +432,7 @@ QScriptValue::QScriptValue(const QLatin1String &value)
QScriptValue::QScriptValue(const char *value)
: d_ptr(new (/*engine=*/0)QScriptValuePrivate(/*engine=*/0))
{
- d_ptr->initFrom(QString::fromAscii(value));
+ d_ptr->initFrom(QString::fromLatin1(value));
}
#endif