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

QtCore: use new QLatin1String::arg()

Browse Source 
Saves ~600B in text size on optimized GCC 9.1 Linux AMD64 builds.

Change-Id: I12f4e7c8d28af9549b481859bc96a155aeb6f15c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2019-06-03 23:08:05 +02:00
parent ed02ab78ea
commit 9c357d64db
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qfile.cpp
View File

@ -810,7 +810,7 @@ QFile::copy(const QString &newName)
error = true; error = true;
d->setError(QFile::CopyError, tr("Cannot open %1 for input").arg(d->fileName)); d->setError(QFile::CopyError, tr("Cannot open %1 for input").arg(d->fileName));
} else { } else {
QString fileTemplate = QLatin1String("%1/qt_temp.XXXXXX"); const auto fileTemplate = QLatin1String("%1/qt_temp.XXXXXX");
#ifdef QT_NO_TEMPORARYFILE #ifdef QT_NO_TEMPORARYFILE
QFile out(fileTemplate.arg(QFileInfo(newName).path())); QFile out(fileTemplate.arg(QFileInfo(newName).path()));
if (!out.open(QIODevice::ReadWrite)) if (!out.open(QIODevice::ReadWrite))

2
src/corelib/io/qstandardpaths_android.cpp
View File

@ -136,7 +136,7 @@ static QString getExternalStoragePublicDirectory(const char *directoryField)
*/ */
static QString getExternalFilesDir(const char *directoryField = 0) static QString getExternalFilesDir(const char *directoryField = 0)
{ {
QString &path = (*androidDirCache)[QString(QLatin1String("APPNAME_%1")).arg(QLatin1String(directoryField))]; QString &path = (*androidDirCache)[QLatin1String("APPNAME_%1").arg(QLatin1String(directoryField))];
if (!path.isEmpty()) if (!path.isEmpty())
return path; return path;

18
src/corelib/io/qurl.cpp
View File

@ -3991,21 +3991,21 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err
return QString(); return QString();
case QUrlPrivate::InvalidSchemeError: { case QUrlPrivate::InvalidSchemeError: {
QString msg = QStringLiteral("Invalid scheme (character '%1' not permitted)"); auto msg = QLatin1String("Invalid scheme (character '%1' not permitted)");
return msg.arg(c); return msg.arg(c);
} }
case QUrlPrivate::InvalidUserNameError: case QUrlPrivate::InvalidUserNameError:
return QString(QStringLiteral("Invalid user name (character '%1' not permitted)")) return QLatin1String("Invalid user name (character '%1' not permitted)")
.arg(c); .arg(c);
case QUrlPrivate::InvalidPasswordError: case QUrlPrivate::InvalidPasswordError:
return QString(QStringLiteral("Invalid password (character '%1' not permitted)")) return QLatin1String("Invalid password (character '%1' not permitted)")
.arg(c); .arg(c);
case QUrlPrivate::InvalidRegNameError: case QUrlPrivate::InvalidRegNameError:
if (errorPosition != -1) if (errorPosition != -1)
return QString(QStringLiteral("Invalid hostname (character '%1' not permitted)")) return QLatin1String("Invalid hostname (character '%1' not permitted)")
.arg(c); .arg(c);
else else
return QStringLiteral("Invalid hostname (contains invalid characters)"); return QStringLiteral("Invalid hostname (contains invalid characters)");
@ -4014,9 +4014,9 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err
case QUrlPrivate::InvalidIPv6AddressError: case QUrlPrivate::InvalidIPv6AddressError:
return QStringLiteral("Invalid IPv6 address"); return QStringLiteral("Invalid IPv6 address");
case QUrlPrivate::InvalidCharacterInIPv6Error: case QUrlPrivate::InvalidCharacterInIPv6Error:
return QStringLiteral("Invalid IPv6 address (character '%1' not permitted)").arg(c); return QLatin1String("Invalid IPv6 address (character '%1' not permitted)").arg(c);
case QUrlPrivate::InvalidIPvFutureError: case QUrlPrivate::InvalidIPvFutureError:
return QStringLiteral("Invalid IPvFuture address (character '%1' not permitted)").arg(c); return QLatin1String("Invalid IPvFuture address (character '%1' not permitted)").arg(c);
case QUrlPrivate::HostMissingEndBracket: case QUrlPrivate::HostMissingEndBracket:
return QStringLiteral("Expected ']' to match '[' in hostname"); return QStringLiteral("Expected ']' to match '[' in hostname");
@ -4026,15 +4026,15 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err
return QStringLiteral("Port field was empty"); return QStringLiteral("Port field was empty");
case QUrlPrivate::InvalidPathError: case QUrlPrivate::InvalidPathError:
return QString(QStringLiteral("Invalid path (character '%1' not permitted)")) return QLatin1String("Invalid path (character '%1' not permitted)")
.arg(c); .arg(c);
case QUrlPrivate::InvalidQueryError: case QUrlPrivate::InvalidQueryError:
return QString(QStringLiteral("Invalid query (character '%1' not permitted)")) return QLatin1String("Invalid query (character '%1' not permitted)")
.arg(c); .arg(c);
case QUrlPrivate::InvalidFragmentError: case QUrlPrivate::InvalidFragmentError:
return QString(QStringLiteral("Invalid fragment (character '%1' not permitted)")) return QLatin1String("Invalid fragment (character '%1' not permitted)")
.arg(c); .arg(c);
case QUrlPrivate::AuthorityPresentAndPathIsRelative: case QUrlPrivate::AuthorityPresentAndPathIsRelative:

8
src/corelib/kernel/qjni.cpp
View File

@ -47,9 +47,9 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static inline QString keyBase() static inline QLatin1String keyBase()
{ {
return QStringLiteral("%1%2:%3"); return QLatin1String("%1%2:%3");
} }
static QString qt_convertJString(jstring string) static QString qt_convertJString(jstring string)
@ -154,7 +154,7 @@ static jmethodID getCachedMethodID(JNIEnv *env,
if (className.isEmpty()) if (className.isEmpty())
return getMethodID(env, clazz, name, sig, isStatic); return getMethodID(env, clazz, name, sig, isStatic);
const QString key = keyBase().arg(QLatin1String(className)).arg(QLatin1String(name)).arg(QLatin1String(sig)); const QString key = keyBase().arg(QLatin1String(className), QLatin1String(name), QLatin1String(sig));
QHash<QString, jmethodID>::const_iterator it; QHash<QString, jmethodID>::const_iterator it;
{ {
@ -206,7 +206,7 @@ static jfieldID getCachedFieldID(JNIEnv *env,
if (className.isNull()) if (className.isNull())
return getFieldID(env, clazz, name, sig, isStatic); return getFieldID(env, clazz, name, sig, isStatic);
const QString key = keyBase().arg(QLatin1String(className)).arg(QLatin1String(name)).arg(QLatin1String(sig)); const QString key = keyBase().arg(QLatin1String(className), QLatin1String(name), QLatin1String(sig));
QHash<QString, jfieldID>::const_iterator it; QHash<QString, jfieldID>::const_iterator it;
{ {

6
src/corelib/kernel/qsystemsemaphore_systemv.cpp
View File

@ -76,7 +76,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
#if QT_CONFIG(translation) #if QT_CONFIG(translation)
QCoreApplication::tr("%1: key is empty", "QSystemSemaphore") QCoreApplication::tr("%1: key is empty", "QSystemSemaphore")
#else #else
QString::fromLatin1("%1: key is empty") QLatin1String("%1: key is empty")
#endif #endif
.arg(QLatin1String("QSystemSemaphore::handle:")); .arg(QLatin1String("QSystemSemaphore::handle:"));
error = QSystemSemaphore::KeyError; error = QSystemSemaphore::KeyError;
@ -94,7 +94,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
#if QT_CONFIG(translation) #if QT_CONFIG(translation)
QCoreApplication::tr("%1: unable to make key", "QSystemSemaphore") QCoreApplication::tr("%1: unable to make key", "QSystemSemaphore")
#else #else
QString::fromLatin1("%1: unable to make key") QLatin1String("%1: unable to make key")
#endif #endif
.arg(QLatin1String("QSystemSemaphore::handle:")); .arg(QLatin1String("QSystemSemaphore::handle:"));
error = QSystemSemaphore::KeyError; error = QSystemSemaphore::KeyError;
@ -111,7 +111,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
#if QT_CONFIG(translation) #if QT_CONFIG(translation)
QCoreApplication::tr("%1: ftok failed", "QSystemSemaphore") QCoreApplication::tr("%1: ftok failed", "QSystemSemaphore")
#else #else
QString::fromLatin1("%1: ftok failed") QLatin1String("%1: ftok failed")
#endif #endif
.arg(QLatin1String("QSystemSemaphore::handle:")); .arg(QLatin1String("QSystemSemaphore::handle:"));
error = QSystemSemaphore::KeyError; error = QSystemSemaphore::KeyError;

12
src/corelib/plugin/qlibrary_unix.cpp
View File

@ -77,14 +77,14 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion)
// .so is preferred. // .so is preferred.
# if defined(__ia64) # if defined(__ia64)
if (!fullVersion.isEmpty()) { if (!fullVersion.isEmpty()) {
suffixes << QString::fromLatin1(".so.%1").arg(fullVersion); suffixes << QLatin1String(".so.%1").arg(fullVersion);
} else { } else {
suffixes << QLatin1String(".so"); suffixes << QLatin1String(".so");
} }
# endif # endif
if (!fullVersion.isEmpty()) { if (!fullVersion.isEmpty()) {
suffixes << QString::fromLatin1(".sl.%1").arg(fullVersion); suffixes << QLatin1String(".sl.%1").arg(fullVersion);
suffixes << QString::fromLatin1(".%1").arg(fullVersion); suffixes << QLatin1String(".%1").arg(fullVersion);
} else { } else {
suffixes << QLatin1String(".sl"); suffixes << QLatin1String(".sl");
} }
@ -93,15 +93,15 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion)
#else #else
if (!fullVersion.isEmpty()) { if (!fullVersion.isEmpty()) {
suffixes << QString::fromLatin1(".so.%1").arg(fullVersion); suffixes << QLatin1String(".so.%1").arg(fullVersion);
} else { } else {
suffixes << QLatin1String(".so"); suffixes << QLatin1String(".so");
} }
#endif #endif
# ifdef Q_OS_MAC # ifdef Q_OS_MAC
if (!fullVersion.isEmpty()) { if (!fullVersion.isEmpty()) {
suffixes << QString::fromLatin1(".%1.bundle").arg(fullVersion); suffixes << QLatin1String(".%1.bundle").arg(fullVersion);
suffixes << QString::fromLatin1(".%1.dylib").arg(fullVersion); suffixes << QLatin1String(".%1.dylib").arg(fullVersion);
} else { } else {
suffixes << QLatin1String(".bundle") << QLatin1String(".dylib"); suffixes << QLatin1String(".bundle") << QLatin1String(".dylib");
} }