diff options
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextimagehandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/psql/qsql_psql.cpp | 4 | ||||
| -rw-r--r-- | src/testlib/qteamcitylogger.cpp | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index e61a6bb48e..eda9d6f24e 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -199,7 +199,7 @@ private: QIconCacheGtkReader::QIconCacheGtkReader(const QString &dirName) : 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()) return; m_file.setFileName(info.absoluteFilePath()); diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 18311ed161..f7117bfe0a 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -61,10 +61,10 @@ static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePi // Also, QFile{Info}::exists works only on filepaths (not urls) if (url->isValid()) { - if (url->scheme() == QLatin1Literal("qrc")) { + if (url->scheme() == QLatin1String("qrc")) { fileName = fileName.right(fileName.length() - 3); } - else if (url->scheme() == QLatin1Literal("file")) { + else if (url->scheme() == QLatin1String("file")) { fileName = url->toLocalFile(); } } diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index fcf75af298..968b71a27d 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -704,10 +704,10 @@ void QPSQLDriverPrivate::detectBackslashEscape() hasBackslashEscape = true; } else { hasBackslashEscape = false; - PGresult* result = exec(QLatin1Literal("SELECT '\\\\' x")); + PGresult* result = exec(QLatin1String("SELECT '\\\\' x")); int status = PQresultStatus(result); 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; PQclear(result); } diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 4773ea937f..1d700d8201 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -228,22 +228,22 @@ QString QTeamCityLogger::tcEscapedString(const QString &str) const switch (ch.toLatin1()) { case '\n': - formattedString.append(QLatin1Literal("|n")); + formattedString.append(QLatin1String("|n")); break; case '\r': - formattedString.append(QLatin1Literal("|r")); + formattedString.append(QLatin1String("|r")); break; case '|': - formattedString.append(QLatin1Literal("||")); + formattedString.append(QLatin1String("||")); break; case '[': - formattedString.append(QLatin1Literal("|[")); + formattedString.append(QLatin1String("|[")); break; case ']': - formattedString.append(QLatin1Literal("|]")); + formattedString.append(QLatin1String("|]")); break; case '\'': - formattedString.append(QLatin1Literal("|'")); + formattedString.append(QLatin1String("|'")); break; default: formattedString.append(ch); |