diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 16:32:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 12:45:52 +0200 |
| commit | 575ede308e7a237980c3c1ba50a7e80941cd34c6 (patch) | |
| tree | 8114a3f5c5719d81ecf800a5ccaca9335bac6b68 /src/gui | |
| parent | 712ca9d95a92d62eda809c959998313413516aa9 (diff) | |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtGui]
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: I2850033159508ebb1ff7564e15b99a146dbee94c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.h | 16 | ||||
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index db549699a7..aa81061c24 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -326,9 +326,9 @@ inline QString QImage::text(const char* key, const char* lang) const { if (!d) return QString(); - QString k = QString::fromAscii(key); + QString k = QString::fromLatin1(key); if (lang && *lang) - k += QLatin1Char('/') + QString::fromAscii(lang); + k += QLatin1Char('/') + QString::fromLatin1(lang); return text(k); } @@ -342,8 +342,8 @@ inline QList<QImageTextKeyLang> QImage::textList() const int index = keys.at(i).indexOf(QLatin1Char('/')); if (index > 0) { QImageTextKeyLang tkl(true); - tkl.key = keys.at(i).left(index).toAscii(); - tkl.lang = keys.at(i).mid(index+1).toAscii(); + tkl.key = keys.at(i).left(index).toLatin1(); + tkl.lang = keys.at(i).mid(index+1).toLatin1(); imageTextKeys += tkl; } } @@ -370,9 +370,9 @@ inline QString QImage::text(const QImageTextKeyLang&kl) const { if (!d) return QString(); - QString k = QString::fromAscii(kl.key.constData()); + QString k = QString::fromLatin1(kl.key.constData()); if (!kl.lang.isEmpty()) - k += QLatin1Char('/') + QString::fromAscii(kl.lang.constData()); + k += QLatin1Char('/') + QString::fromLatin1(kl.lang.constData()); return text(k); } @@ -386,9 +386,9 @@ inline void QImage::setText(const char* key, const char* lang, const QString &s) if (!d) return; - QString k = QString::fromAscii(key); + QString k = QString::fromLatin1(key); if (lang && *lang) - k += QLatin1Char('/') + QString::fromAscii(lang); + k += QLatin1Char('/') + QString::fromLatin1(lang); setText(k, s); } diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index f9fe166c29..89f6d1a3af 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2025,7 +2025,7 @@ QString QTextHtmlExporter::toHtml(const QByteArray &encoding, ExportMode mode) fragmentMarkers = (mode == ExportFragment); if (!encoding.isEmpty()) - html += QString::fromLatin1("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").arg(QString::fromAscii(encoding)); + html += QString::fromLatin1("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").arg(QString::fromLatin1(encoding)); QString title = doc->metaInformation(QTextDocument::DocumentTitle); if (!title.isEmpty()) |