From: Marc Mutz Date: Fri, 18 May 2012 18:00:23 +0000 (+0200) Subject: Use QStringList::join(QChar) overload where applicable [QtWidgets] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=781b642671e1f2195e69039547c5101a573540d8;p=profile%2Fivi%2Fqtbase.git Use QStringList::join(QChar) overload where applicable [QtWidgets] This is an automated change performing the following replacements: join\("(.)"\) -> join('\1') join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1')) join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1')) Change-Id: Ia30048e0c40967dc86a4e4ad26ac02ab67519096 Reviewed-by: João Abecasis Reviewed-by: Marc Mutz --- diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp index 4c6b046..6d95078 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp +++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp @@ -1701,7 +1701,7 @@ bool AtSpiAdaptor::actionInterface(const QAIPointer &interface, const QString &f keyBindings.append(acc); } if (keyBindings.length() > 0) - sendReply(connection, message, keyBindings.join(QLatin1String(";"))); + sendReply(connection, message, keyBindings.join(QLatin1Char(';'))); else sendReply(connection, message, QString()); } else { diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index a26592d..06e8982 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -204,7 +204,7 @@ static inline QFont *readKdeFontSetting(const QSettings &settings, const QString const QStringList list = fontValue.toStringList(); if (!list.isEmpty()) { fontFamily = list.first(); - fontDescription = list.join(QStringLiteral(",")); + fontDescription = list.join(QLatin1Char(',')); } } else { fontDescription = fontFamily = fontValue.toString(); diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index d001403..08e1977 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -3049,7 +3049,7 @@ void QFileDialogPrivate::_q_selectionChanged() allFiles.replace(i, QString(QLatin1Char('"') + allFiles.at(i) + QLatin1Char('"'))); } - QString finalFiles = allFiles.join(QLatin1String(" ")); + QString finalFiles = allFiles.join(QLatin1Char(' ')); if (!finalFiles.isEmpty() && !lineEdit()->hasFocus() && lineEdit()->isVisible()) lineEdit()->setText(finalFiles); else diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 887fa2c..ffbf7c2 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -1468,7 +1468,7 @@ public: } QString valueStr; if(value.type() == QVariant::StringList || value.type() == QVariant::List) - valueStr = value.toStringList().join(QLatin1String(" ")); + valueStr = value.toStringList().join(QLatin1Char(' ')); else valueStr = value.toString(); cache[name] = valueStr; diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index dd1e153..6fcf620 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -87,7 +87,7 @@ QString CsvCompleter::pathFromIndex(const QModelIndex& si) const if (list.count() == 1) return list[0]; - return list.join(","); + return list.join(','); } class tst_QCompleter : public QObject