Use QStringList::join(QChar) overload where applicable [examples]

This is an automated change performing the following replacements:
                    join\("(.)"\) -> join('\1')
  join\(QLatin1String\("(.)"\)\)  -> join(QLatin1Char('\1'))
  join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))

Change-Id: I1d0c9782cc1522d937b930531720e32d4c8f7ce8
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

diff --git a/examples/network/dnslookup/dnslookup.cpp b/examples/network/dnslookup/dnslookup.cpp
index 79f901e..77e8abc 100644 (file)
--- a/examples/network/dnslookup/dnslookup.cpp
+++ b/examples/network/dnslookup/dnslookup.cpp
@@ -138,7 +138,7 @@ void DnsManager::showResults()
         QStringList values;
         foreach (const QByteArray &ba, record.values())
             values << "\"" + QString::fromLatin1(ba) + "\"";
-        printf("%s\t%i\tIN\tTXT\t%s\n", qPrintable(record.name()), record.timeToLive(), qPrintable(values.join(" ")));
+        printf("%s\t%i\tIN\tTXT\t%s\n", qPrintable(record.name()), record.timeToLive(), qPrintable(values.join(' ')));
     }
 
     QCoreApplication::instance()->quit();

diff --git a/examples/network/securesocketclient/certificateinfo.cpp b/examples/network/securesocketclient/certificateinfo.cpp
index e05d877..23f8d9d 100644 (file)
--- a/examples/network/securesocketclient/certificateinfo.cpp
+++ b/examples/network/securesocketclient/certificateinfo.cpp
@@ -65,8 +65,8 @@ void CertificateInfo::setCertificateChain(const QList<QSslCertificate> &chain)
     for (int i = 0; i < chain.size(); ++i) {
         const QSslCertificate &cert = chain.at(i);
         form->certificationPathView->addItem(tr("%1%2 (%3)").arg(!i ? QString() : tr("Issued by: "))
-                                             .arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
-                                             .arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" "))));
+                                             .arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1Char(' ')))
+                                             .arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1Char(' '))));
     }
 
     form->certificationPathView->setCurrentIndex(0);
@@ -78,19 +78,19 @@ void CertificateInfo::updateCertificateInfo(int index)
     if (index >= 0 && index < chain.size()) {
         const QSslCertificate &cert = chain.at(index);
         QStringList lines;
-        lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
-              << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
-              << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
-              << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
-              << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
-              << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1String(" ")))
+        lines << tr("Organization: %1").arg(cert.subjectInfo(QSslCertificate::Organization).join(QLatin1Char(' ')))
+              << tr("Subunit: %1").arg(cert.subjectInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1Char(' ')))
+              << tr("Country: %1").arg(cert.subjectInfo(QSslCertificate::CountryName).join(QLatin1Char(' ')))
+              << tr("Locality: %1").arg(cert.subjectInfo(QSslCertificate::LocalityName).join(QLatin1Char(' ')))
+              << tr("State/Province: %1").arg(cert.subjectInfo(QSslCertificate::StateOrProvinceName).join(QLatin1Char(' ')))
+              << tr("Common Name: %1").arg(cert.subjectInfo(QSslCertificate::CommonName).join(QLatin1Char(' ')))
               << QString()
-              << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization).join(QLatin1String(" ")))
-              << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1String(" ")))
-              << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName).join(QLatin1String(" ")))
-              << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName).join(QLatin1String(" ")))
-              << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName).join(QLatin1String(" ")))
-              << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName).join(QLatin1String(" ")));
+              << tr("Issuer Organization: %1").arg(cert.issuerInfo(QSslCertificate::Organization).join(QLatin1Char(' ')))
+              << tr("Issuer Unit Name: %1").arg(cert.issuerInfo(QSslCertificate::OrganizationalUnitName).join(QLatin1Char(' ')))
+              << tr("Issuer Country: %1").arg(cert.issuerInfo(QSslCertificate::CountryName).join(QLatin1Char(' ')))
+              << tr("Issuer Locality: %1").arg(cert.issuerInfo(QSslCertificate::LocalityName).join(QLatin1Char(' ')))
+              << tr("Issuer State/Province: %1").arg(cert.issuerInfo(QSslCertificate::StateOrProvinceName).join(QLatin1Char(' ')))
+              << tr("Issuer Common Name: %1").arg(cert.issuerInfo(QSslCertificate::CommonName).join(QLatin1Char(' ')));
         foreach (QString line, lines)
             form->certificateInfoView->addItem(line);
     } else {

diff --git a/examples/threads/queuedcustomtype/window.cpp b/examples/threads/queuedcustomtype/window.cpp
index 8e7bc64..9dc07ec 100644 (file)
--- a/examples/threads/queuedcustomtype/window.cpp
+++ b/examples/threads/queuedcustomtype/window.cpp
@@ -84,7 +84,7 @@ void Window::loadImage()
             formats.append("*." + format);
 
     QString newPath = QFileDialog::getOpenFileName(this, tr("Open Image"),
-        path, tr("Image files (%1)").arg(formats.join(" ")));
+        path, tr("Image files (%1)").arg(formats.join(' ')));
 
     if (newPath.isEmpty())
         return;

diff --git a/examples/tools/settingseditor/variantdelegate.cpp b/examples/tools/settingseditor/variantdelegate.cpp
index 2458262..7b1da5a 100644 (file)
--- a/examples/tools/settingseditor/variantdelegate.cpp
+++ b/examples/tools/settingseditor/variantdelegate.cpp
@@ -306,7 +306,7 @@ QString VariantDelegate::displayText(const QVariant &value)
             return QString("(%1,%2)").arg(size.width()).arg(size.height());
         }
     case QVariant::StringList:
-        return value.toStringList().join(",");
+        return value.toStringList().join(',');
     case QVariant::Time:
         return value.toTime().toString(Qt::ISODate);
     default:

diff --git a/examples/widgets/itemviews/chart/mainwindow.cpp b/examples/widgets/itemviews/chart/mainwindow.cpp
index edaf302..b94ca35 100644 (file)
--- a/examples/widgets/itemviews/chart/mainwindow.cpp
+++ b/examples/widgets/itemviews/chart/mainwindow.cpp
@@ -162,7 +162,7 @@ void MainWindow::saveFile()
                 pieces.append(model->data(model->index(row, 0, QModelIndex()),
                                           Qt::DecorationRole).toString());
 
-                stream << pieces.join(",") << "\n";
+                stream << pieces.join(',') << "\n";
             }
         }
 

diff --git a/examples/widgets/itemviews/simpledommodel/dommodel.cpp b/examples/widgets/itemviews/simpledommodel/dommodel.cpp
index 2d1b9c9..c47e733 100644 (file)
--- a/examples/widgets/itemviews/simpledommodel/dommodel.cpp
+++ b/examples/widgets/itemviews/simpledommodel/dommodel.cpp
@@ -91,9 +91,9 @@ QVariant DomModel::data(const QModelIndex &index, int role) const
                 attributes << attribute.nodeName() + "=\""
                               +attribute.nodeValue() + "\"";
             }
-            return attributes.join(" ");
+            return attributes.join(' ');
         case 2:
-            return node.nodeValue().split("\n").join(" ");
+            return node.nodeValue().split("\n").join(' ');
         default:
             return QVariant();
     }

diff --git a/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp
index 86350a7..9005d7b 100644 (file)
--- a/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp
@@ -427,7 +427,7 @@ void AddressBook::exportAsVCard()
     out << "N:" << lastName << ";" << firstName << "\n";
         
     if (!nameList.isEmpty())            
-       out << "FN:" << nameList.join(" ") << "\n";
+       out << "FN:" << nameList.join(' ') << "\n";
     else
        out << "FN:" << firstName << "\n";
 //! [export function part3] 

diff --git a/examples/widgets/tutorials/addressbook/part7/addressbook.cpp b/examples/widgets/tutorials/addressbook/part7/addressbook.cpp
index 81ae190..ad268ad 100644 (file)
--- a/examples/widgets/tutorials/addressbook/part7/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part7/addressbook.cpp
@@ -427,7 +427,7 @@ void AddressBook::exportAsVCard()
     out << "N:" << lastName << ";" << firstName << "\n";
         
     if (!nameList.isEmpty())            
-       out << "FN:" << nameList.join(" ") << "\n";
+       out << "FN:" << nameList.join(' ') << "\n";
     else
        out << "FN:" << firstName << "\n";
 //! [export function part3]