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

Use qToStringViewIgnoringNull() where applicable

Browse Source 
Saves just over ¼KiB in QtCore text size on optimized GCC 6.1 Linux
AMD64 builds, iow: qToStringViewIgnoringNull() saves ~40B per use.

Change-Id: I3278306d5ce594e8ccd0f58b8f8d0319637d1b2b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2017-04-13 14:45:53 +02:00
parent ba5db13c8d
commit e9fd074cec
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/tools/qregularexpression.cpp
View File

@ -2108,7 +2108,7 @@ QStringView QRegularExpressionMatch::capturedView(int nth) const
*/ */
QString QRegularExpressionMatch::captured(const QString &name) const QString QRegularExpressionMatch::captured(const QString &name) const
{ {
return captured(QStringView(name)); return captured(qToStringViewIgnoringNull(name));
} }
/*! /*!
@ -2123,7 +2123,7 @@ QString QRegularExpressionMatch::captured(const QString &name) const
*/ */
QStringRef QRegularExpressionMatch::capturedRef(const QString &name) const QStringRef QRegularExpressionMatch::capturedRef(const QString &name) const
{ {
return capturedRef(QStringView(name)); return capturedRef(qToStringViewIgnoringNull(name));
} }
#endif // QT_STRINGVIEW_LEVEL < 2 #endif // QT_STRINGVIEW_LEVEL < 2
@ -2267,7 +2267,7 @@ int QRegularExpressionMatch::capturedEnd(int nth) const
*/ */
int QRegularExpressionMatch::capturedStart(const QString &name) const int QRegularExpressionMatch::capturedStart(const QString &name) const
{ {
return capturedStart(QStringView(name)); return capturedStart(qToStringViewIgnoringNull(name));
} }
/*! /*!
@ -2281,7 +2281,7 @@ int QRegularExpressionMatch::capturedStart(const QString &name) const
*/ */
int QRegularExpressionMatch::capturedLength(const QString &name) const int QRegularExpressionMatch::capturedLength(const QString &name) const
{ {
return capturedLength(QStringView(name)); return capturedLength(qToStringViewIgnoringNull(name));
} }
/*! /*!
@ -2294,7 +2294,7 @@ int QRegularExpressionMatch::capturedLength(const QString &name) const
*/ */
int QRegularExpressionMatch::capturedEnd(const QString &name) const int QRegularExpressionMatch::capturedEnd(const QString &name) const
{ {
return capturedEnd(QStringView(name)); return capturedEnd(qToStringViewIgnoringNull(name));
} }
#endif // QT_STRINGVIEW_LEVEL < 2 #endif // QT_STRINGVIEW_LEVEL < 2

2
src/corelib/tools/qstring.cpp
View File

@ -7723,7 +7723,7 @@ static QString replaceArgEscapes(QStringView s, const ArgEscapeData &d, int fiel
*/ */
QString QString::arg(const QString &a, int fieldWidth, QChar fillChar) const QString QString::arg(const QString &a, int fieldWidth, QChar fillChar) const
{ {
return arg(QStringView(a), fieldWidth, fillChar); return arg(qToStringViewIgnoringNull(a), fieldWidth, fillChar);
} }
#endif // QT_STRINGVIEW_LEVEL < 2 #endif // QT_STRINGVIEW_LEVEL < 2

4
src/gui/painting/qcolor.cpp
View File

@ -884,7 +884,7 @@ QString QColor::name(NameFormat format) const
void QColor::setNamedColor(const QString &name) void QColor::setNamedColor(const QString &name)
{ {
setColorFromString(QStringView(name)); setColorFromString(qToStringViewIgnoringNull(name));
} }
#endif #endif
@ -922,7 +922,7 @@ void QColor::setNamedColor(QLatin1String name)
*/ */
bool QColor::isValidColor(const QString &name) bool QColor::isValidColor(const QString &name)
{ {
return isValidColor(QStringView(name)); return isValidColor(qToStringViewIgnoringNull(name));
} }
#endif #endif