AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change remaining uses of {to,from}Ascii to {to,from}Latin1 [platformsupport]

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2012-05-02 16:32:26 +02:00 committed by Qt by Nokia
parent c68d8ca76c
commit e563ca1a75
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/desktop/screenshot/screenshot.cpp
View File

@ -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]

6
examples/dialogs/classwizard/classwizard.cpp
View File

@ -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()) {

2
src/platformsupport/cglconvenience/cglconvenience.mm
View File

@ -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);

4
src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
View File

@ -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;