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

Make better use of new QStringList::join(QLatin1String) overload

Browse Source 
It was added in Qt 5.8.

Change-Id: I7194fbfaef9219110604f3b03a893a658c996c06
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2017-02-18 12:31:19 +01:00
parent cfe1a295fc
commit 9965e92e4f
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qguiapplication.cpp
View File

@ -1124,7 +1124,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
= QStringLiteral("This application failed to start because it could not find or load the Qt platform plugin \"%1\"\nin \"%2\".\n\n").arg(name, QDir::toNativeSeparators(platformPluginPath)); = QStringLiteral("This application failed to start because it could not find or load the Qt platform plugin \"%1\"\nin \"%2\".\n\n").arg(name, QDir::toNativeSeparators(platformPluginPath));
if (!keys.isEmpty()) { if (!keys.isEmpty()) {
fatalMessage += QStringLiteral("Available platform plugins are: %1.\n\n").arg( fatalMessage += QStringLiteral("Available platform plugins are: %1.\n\n").arg(
keys.join(QStringLiteral(", "))); keys.join(QLatin1String(", ")));
} }
fatalMessage += QStringLiteral("Reinstalling the application may fix this problem."); fatalMessage += QStringLiteral("Reinstalling the application may fix this problem.");
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)

4
src/plugins/platforms/windows/qwindowsclipboard.cpp
View File

@ -81,7 +81,7 @@ static QDebug operator<<(QDebug d, const QMimeData *mimeData)
d << "QMimeData("; d << "QMimeData(";
if (mimeData) { if (mimeData) {
const QStringList formats = mimeData->formats(); const QStringList formats = mimeData->formats();
d << "formats=" << formats.join(QStringLiteral(", ")); d << "formats=" << formats.join(QLatin1String(", "));
if (mimeData->hasText()) if (mimeData->hasText())
d << ", text=" << mimeData->text(); d << ", text=" << mimeData->text();
if (mimeData->hasHtml()) if (mimeData->hasHtml())
@ -321,7 +321,7 @@ void QWindowsClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
const HRESULT src = OleSetClipboard(m_data); const HRESULT src = OleSetClipboard(m_data);
if (src != S_OK) { if (src != S_OK) {
QString mimeDataFormats = mimeData ? QString mimeDataFormats = mimeData ?
mimeData->formats().join(QStringLiteral(", ")) : QString(QStringLiteral("NULL")); mimeData->formats().join(QLatin1String(", ")) : QString(QStringLiteral("NULL"));
qErrnoWarning("OleSetClipboard: Failed to set mime data (%s) on clipboard: %s", qErrnoWarning("OleSetClipboard: Failed to set mime data (%s) on clipboard: %s",
qPrintable(mimeDataFormats), qPrintable(mimeDataFormats),
QWindowsContext::comErrorString(src).constData()); QWindowsContext::comErrorString(src).constData());

2
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -1189,7 +1189,7 @@ void QWindowsNativeFileDialogBase::selectNameFilter(const QString &filter)
if (index < 0) { if (index < 0) {
qWarning("%s: Invalid parameter '%s' not found in '%s'.", qWarning("%s: Invalid parameter '%s' not found in '%s'.",
__FUNCTION__, qPrintable(filter), __FUNCTION__, qPrintable(filter),
qPrintable(m_nameFilters.join(QStringLiteral(", ")))); qPrintable(m_nameFilters.join(QLatin1String(", "))));
return; return;
} }
m_fileDialog->SetFileTypeIndex(index + 1); // one-based. m_fileDialog->SetFileTypeIndex(index + 1); // one-based.

2
src/tools/moc/main.cpp
View File

@ -305,7 +305,7 @@ int runMoc(int argc, char **argv)
const QStringList files = parser.positionalArguments(); const QStringList files = parser.positionalArguments();
if (files.count() > 1) { if (files.count() > 1) {
error(qPrintable(QStringLiteral("Too many input files specified: '") + files.join(QStringLiteral("' '")) + QLatin1Char('\''))); error(qPrintable(QLatin1String("Too many input files specified: '") + files.join(QLatin1String("' '")) + QLatin1Char('\'')));
parser.showHelp(1); parser.showHelp(1);
} else if (!files.isEmpty()) { } else if (!files.isEmpty()) {
filename = files.first(); filename = files.first();