1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace QLatin1Literal with QLatin1String

Browse Source 
QLatin1Literal is just alias of QLatin1String
for Qt4 compatibility.
So it's style cleanup patch.

Change-Id: Ia3b3e5dc3169f13a1ef819d69be576b8a8bfb258
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Anton Kudryavtsev 2016-08-26 13:26:29 +03:00
parent 397f345a6a
commit 6dbb16a856
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/image/qiconloader.cpp
View File

@ -199,7 +199,7 @@ private:
QIconCacheGtkReader::QIconCacheGtkReader(const QString &dirName) QIconCacheGtkReader::QIconCacheGtkReader(const QString &dirName)
: m_isValid(false) : m_isValid(false)
{ {
QFileInfo info(dirName + QLatin1Literal("/icon-theme.cache")); QFileInfo info(dirName + QLatin1String("/icon-theme.cache"));
if (!info.exists() || info.lastModified() < QFileInfo(dirName).lastModified()) if (!info.exists() || info.lastModified() < QFileInfo(dirName).lastModified())
return; return;
m_file.setFileName(info.absoluteFilePath()); m_file.setFileName(info.absoluteFilePath());

4
src/gui/text/qtextimagehandler.cpp
View File

@ -61,10 +61,10 @@ static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePi
// Also, QFile{Info}::exists works only on filepaths (not urls) // Also, QFile{Info}::exists works only on filepaths (not urls)
if (url->isValid()) { if (url->isValid()) {
if (url->scheme() == QLatin1Literal("qrc")) { if (url->scheme() == QLatin1String("qrc")) {
fileName = fileName.right(fileName.length() - 3); fileName = fileName.right(fileName.length() - 3);
} }
else if (url->scheme() == QLatin1Literal("file")) { else if (url->scheme() == QLatin1String("file")) {
fileName = url->toLocalFile(); fileName = url->toLocalFile();
} }
} }

4
src/plugins/sqldrivers/psql/qsql_psql.cpp
View File

@ -704,10 +704,10 @@ void QPSQLDriverPrivate::detectBackslashEscape()
hasBackslashEscape = true; hasBackslashEscape = true;
} else { } else {
hasBackslashEscape = false; hasBackslashEscape = false;
PGresult* result = exec(QLatin1Literal("SELECT '\\\\' x")); PGresult* result = exec(QLatin1String("SELECT '\\\\' x"));
int status = PQresultStatus(result); int status = PQresultStatus(result);
if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK)
if (QString::fromLatin1(PQgetvalue(result, 0, 0)) == QLatin1Literal("\\")) if (QString::fromLatin1(PQgetvalue(result, 0, 0)) == QLatin1String("\\"))
hasBackslashEscape = true; hasBackslashEscape = true;
PQclear(result); PQclear(result);
} }

12
src/testlib/qteamcitylogger.cpp
View File

@ -228,22 +228,22 @@ QString QTeamCityLogger::tcEscapedString(const QString &str) const
switch (ch.toLatin1()) { switch (ch.toLatin1()) {
case '\n': case '\n':
formattedString.append(QLatin1Literal("|n")); formattedString.append(QLatin1String("|n"));
break; break;
case '\r': case '\r':
formattedString.append(QLatin1Literal("|r")); formattedString.append(QLatin1String("|r"));
break; break;
case '|': case '|':
formattedString.append(QLatin1Literal("||")); formattedString.append(QLatin1String("||"));
break; break;
case '[': case '[':
formattedString.append(QLatin1Literal("|[")); formattedString.append(QLatin1String("|["));
break; break;
case ']': case ']':
formattedString.append(QLatin1Literal("|]")); formattedString.append(QLatin1String("|]"));
break; break;
case '\'': case '\'':
formattedString.append(QLatin1Literal("|'")); formattedString.append(QLatin1String("|'"));
break; break;
default: default:
formattedString.append(ch); formattedString.append(ch);