summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-02 16:32:26 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-04 15:27:59 +0200
commite563ca1a7512a48e4d3e205ac8807d61c070d3f7 (patch)
tree9fb1c8ac9d8053db9e4205aa381817035e4d1808
parentc68d8ca76cd7000308d62943e156b0c9c6f9ae02 (diff)
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [platformsupport]
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: Ie1a4e5ceca21c31e7357f28b90abc9129b122104 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--examples/desktop/screenshot/screenshot.cpp2
-rw-r--r--examples/dialogs/classwizard/classwizard.cpp6
-rw-r--r--src/platformsupport/cglconvenience/cglconvenience.mm2
-rw-r--r--src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/examples/desktop/screenshot/screenshot.cpp b/examples/desktop/screenshot/screenshot.cpp
index 66467d439f..c9310c9e2f 100644
--- a/examples/desktop/screenshot/screenshot.cpp
+++ b/examples/desktop/screenshot/screenshot.cpp
@@ -102,7 +102,7 @@ void Screenshot::saveScreenshot()
.arg(format.toUpper())
.arg(format));
if (!fileName.isEmpty())
- originalPixmap.save(fileName, format.toAscii().constData());
+ originalPixmap.save(fileName, format.toLatin1().constData());
}
//! [3]
diff --git a/examples/dialogs/classwizard/classwizard.cpp b/examples/dialogs/classwizard/classwizard.cpp
index 211a76488d..eeb1fab55b 100644
--- a/examples/dialogs/classwizard/classwizard.cpp
+++ b/examples/dialogs/classwizard/classwizard.cpp
@@ -79,7 +79,7 @@ void ClassWizard::accept()
if (field("comment").toBool()) {
block += "/*\n";
- block += " " + header.toAscii() + "\n";
+ block += " " + header.toLatin1() + "\n";
block += "*/\n";
block += "\n";
}
@@ -141,11 +141,11 @@ void ClassWizard::accept()
if (field("comment").toBool()) {
block += "/*\n";
- block += " " + implementation.toAscii() + "\n";
+ block += " " + implementation.toLatin1() + "\n";
block += "*/\n";
block += "\n";
}
- block += "#include \"" + header.toAscii() + "\"\n";
+ block += "#include \"" + header.toLatin1() + "\"\n";
block += "\n";
if (field("qobjectCtor").toBool()) {
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm
index 325f5c5770..7ca9b6025e 100644
--- a/src/platformsupport/cglconvenience/cglconvenience.mm
+++ b/src/platformsupport/cglconvenience/cglconvenience.mm
@@ -49,7 +49,7 @@ void (*qcgl_getProcAddress(const QByteArray &procName))()
CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,
CFSTR("/System/Library/Frameworks/OpenGL.framework"), kCFURLPOSIXPathStyle, false);
CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url);
- CFStringRef procNameCF = QCFString::toCFStringRef(QString::fromAscii(procName.constData()));
+ CFStringRef procNameCF = QCFString::toCFStringRef(QString::fromLatin1(procName.constData()));
void *proc = CFBundleGetFunctionPointerForName(bundle, procNameCF);
CFRelease(url);
CFRelease(bundle);
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
index 9a7e0d31db..cddc08c750 100644
--- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
@@ -251,7 +251,7 @@ namespace {
void updateFamilyNameAndStyle()
{
- fontDef.family = QString::fromAscii(freetype->face->family_name);
+ fontDef.family = QString::fromLatin1(freetype->face->family_name);
if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC)
fontDef.style = QFont::StyleItalic;
@@ -413,7 +413,7 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt
}
}
- QString family = QString::fromAscii(face->family_name);
+ QString family = QString::fromLatin1(face->family_name);
FontFile *fontFile = new FontFile;
fontFile->fileName = QFile::decodeName(file);
fontFile->indexValue = index;