Tests: Fix single-character string literals.

Use character literals where applicable.

Change-Id: I1a026c320079ee5ca6f70be835d5a541deee2dd1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

11 files changed, 26 insertions, 24 deletions

diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp
index fe96c55636..2b04bd8bda 100644
--- a/tests/manual/bearerex/bearerex.cpp
+++ b/tests/manual/bearerex/bearerex.cpp
@@ -147,7 +147,7 @@ void BearerEx::on_createSessionButton_clicked()
     QNetworkConfiguration networkConfiguration = qvariant_cast<QNetworkConfiguration>(item->data(Qt::UserRole));
     int newTabIndex = mainTabWidget->count();
     SessionTab* newTab = new SessionTab(&networkConfiguration,&m_NetworkConfigurationManager,eventListWidget,newTabIndex-1);
-    QString label = QString("S")+QString::number(newTabIndex-1);
+    QString label = QLatin1Char('S') + QString::number(newTabIndex-1);
     mainTabWidget->insertTab(newTabIndex,newTab,label);
     mainTabWidget->setCurrentIndex(newTabIndex);
 }
@@ -271,9 +271,11 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration,
         snapLabel->hide();
         snapLineEdit->hide();
         alrButton->hide();
-        iapLineEdit->setText(apNetworkConfiguration->name()+" ("+apNetworkConfiguration->identifier()+")");
+        iapLineEdit->setText(apNetworkConfiguration->name()+ " (" + apNetworkConfiguration->identifier()
+                             + QLatin1Char(')'));
     } else if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) {
-        snapLineEdit->setText(apNetworkConfiguration->name()+" ("+apNetworkConfiguration->identifier()+")");
+        snapLineEdit->setText(apNetworkConfiguration->name()+ " (" + apNetworkConfiguration->identifier()
+                              + QLatin1Char(')'));
     }
     bearerLineEdit->setText(apNetworkConfiguration->bearerTypeName());
     sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
@@ -380,7 +382,7 @@ void SessionTab::newConfigurationActivated()
     msgBox.setDefaultButton(QMessageBox::Yes);
     if (msgBox.exec() == QMessageBox::Yes) {
         m_NetworkSession->accept();
-        iapLineEdit->setText(m_config.name()+" ("+m_config.identifier()+")");
+        iapLineEdit->setText(m_config.name() + " (" + m_config.identifier() + QLatin1Char(')'));
     } else {
         m_NetworkSession->reject();
     }
@@ -391,7 +393,7 @@ void SessionTab::preferredConfigurationChanged(const QNetworkConfiguration& conf
     m_config =  config;
     QMessageBox msgBox;
     msgBox.setText("Roaming to new configuration.");
-    msgBox.setInformativeText("Do you want to migrate to "+config.name()+"?");
+    msgBox.setInformativeText("Do you want to migrate to " + config.name() + QLatin1Char('?'));
     msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     msgBox.setDefaultButton(QMessageBox::Yes);
     if (msgBox.exec() == QMessageBox::Yes) {
@@ -407,7 +409,7 @@ void SessionTab::opened()
     QFont font = listItem->font();
     font.setBold(true);
     listItem->setFont(font);
-    listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+QString("Opened"));
+    listItem->setText(QLatin1Char('S') + QString::number(m_index) + QLatin1String(" - Opened"));
     m_eventListWidget->addItem(listItem);
 
     QVariant identifier = m_NetworkSession->sessionProperty("ActiveConfiguration");
@@ -415,7 +417,7 @@ void SessionTab::opened()
         QString configId = identifier.toString();
         QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId);
         if (config.isValid()) {
-            iapLineEdit->setText(config.name()+" ("+config.identifier()+")");
+            iapLineEdit->setText(config.name() + " (" + config.identifier() + QLatin1Char(')'));
         }
     }
     newState(m_NetworkSession->state()); // Update the "(open)"
@@ -438,7 +440,7 @@ void SessionTab::closed()
     QFont font = listItem->font();
     font.setBold(true);
     listItem->setFont(font);
-    listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+QString("Closed"));
+    listItem->setText(QLatin1Char('S') + QString::number(m_index) + QLatin1String(" - Closed"));
     m_eventListWidget->addItem(listItem);
 }
 
@@ -489,7 +491,7 @@ void SessionTab::stateChanged(QNetworkSession::State state)
     newState(state);
 
     QListWidgetItem* listItem = new QListWidgetItem();
-    listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+stateString(state));
+    listItem->setText(QLatin1Char('S') + QString::number(m_index) + QLatin1String(" - ") + stateString(state));
     m_eventListWidget->addItem(listItem);
 }
 
@@ -500,7 +502,7 @@ void SessionTab::newState(QNetworkSession::State state)
         QString configId = identifier.toString();
         QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId);
         if (config.isValid()) {
-            iapLineEdit->setText(config.name()+" ("+config.identifier()+")");
+            iapLineEdit->setText(config.name() + " (" + config.identifier() + QLatin1Char(')'));
             bearerLineEdit->setText(config.bearerTypeName());
         }
     } else {
@@ -539,7 +541,7 @@ void SessionTab::error(QNetworkSession::SessionError error)
             errorString = "InvalidConfigurationError";
             break;
     }
-    listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+errorString);
+    listItem->setText(QLatin1Char('S') + QString::number(m_index) + QString(" - ") + errorString);
     m_eventListWidget->addItem(listItem);
 
     msgBox.setText(errorString);
diff --git a/tests/manual/gestures/graphicsview/main.cpp b/tests/manual/gestures/graphicsview/main.cpp
index 062a1643df..30fd79ec8f 100644
--- a/tests/manual/gestures/graphicsview/main.cpp
+++ b/tests/manual/gestures/graphicsview/main.cpp
@@ -175,7 +175,7 @@ void MainWindow::setDirectory(const QString &path)
     QDir dir(path);
     QStringList files = dir.entryList(QDir::Files | QDir::Readable | QDir::NoDotAndDotDot);
     foreach(const QString &file, files) {
-        QImageReader img(path + QLatin1String("/")+file);
+        QImageReader img(path + QLatin1Char('/') +file);
         QImage image = img.read();
         if (!image.isNull()) {
             {
diff --git a/tests/manual/highdpi/dragwidget.cpp b/tests/manual/highdpi/dragwidget.cpp
index b203566696..dacafef203 100644
--- a/tests/manual/highdpi/dragwidget.cpp
+++ b/tests/manual/highdpi/dragwidget.cpp
@@ -166,7 +166,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event)
     QMimeData *mimeData = new QMimeData;
     mimeData->setText(child->text());
     mimeData->setData("application/x-hotspot",
-                      QByteArray::number(hotSpot.x()) + " " + QByteArray::number(hotSpot.y()));
+                      QByteArray::number(hotSpot.x()) + ' ' + QByteArray::number(hotSpot.y()));
 
     QPixmap pixmap(child->size());
     child->render(&pixmap);
diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp
index 692a60d511..3e0073dd52 100644
--- a/tests/manual/highdpi/main.cpp
+++ b/tests/manual/highdpi/main.cpp
@@ -139,7 +139,7 @@ private slots:
 
             // update label, add ".0" if needed.
             QString number = QString::number(scalefactorF);
-            if (!number.contains("."))
+            if (!number.contains(QLatin1Char('.')))
                 number.append(".0");
             m_label->setText(number);
     }
@@ -203,8 +203,8 @@ DemoController::DemoController(DemoContainerList *demos, QCommandLineParser *par
     foreach (QScreen *screen, screens) {
         // create scale control line
         QSize screenSize = screen->geometry().size();
-        QString screenId = screen->name() + " " + QString::number(screenSize.width())
-                                          + " " + QString::number(screenSize.height());
+        QString screenId = screen->name() + QLatin1Char(' ') + QString::number(screenSize.width())
+                                          + QLatin1Char(' ') + QString::number(screenSize.height());
         LabelSlider *slider = new LabelSlider(this, screenId, layout, layoutRow++);
         slider->setValue(getScreenFactorWithoutPixelDensity(screen) * 10);
 
diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp
index 6c0a651ce6..79e72cb5b3 100644
--- a/tests/manual/lance/main.cpp
+++ b/tests/manual/lance/main.cpp
@@ -602,7 +602,7 @@ int main(int argc, char **argv)
                 pcmd.setType(type);
                 pcmd.setCheckersBackground(checkers_background);
                 pcmd.setContents(content);
-                QString file = QString(files.at(j)).replace(".", "_") + ".ps";
+                QString file = QString(files.at(j)).replace(QLatin1Char('.'), QLatin1Char('_')) + ".ps";
 
                 QPrinter p(highres ? QPrinter::HighResolution : QPrinter::ScreenResolution);
                 if (printdlg) {
diff --git a/tests/manual/network_stresstest/minihttpserver.cpp b/tests/manual/network_stresstest/minihttpserver.cpp
index d97fd7ec96..1a5fefcce7 100644
--- a/tests/manual/network_stresstest/minihttpserver.cpp
+++ b/tests/manual/network_stresstest/minihttpserver.cpp
@@ -141,7 +141,7 @@ void MiniHttpServerConnection::handlePendingRequest()
     }
 
     QUrl uri = QUrl::fromEncoded(request.mid(4, eol - int(strlen(http11)) - 4));
-    source.setFileName(":" + uri.path());
+    source.setFileName(QLatin1Char(':') + uri.path());
 
     // connection-close?
     request = request.toLower();
diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.cpp b/tests/manual/qnetworkaccessmanager/qget/qget.cpp
index 000e268c6e..cb435a792c 100644
--- a/tests/manual/qnetworkaccessmanager/qget/qget.cpp
+++ b/tests/manual/qnetworkaccessmanager/qget/qget.cpp
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
             headersFile=str.mid(10);
         else if (str == "--serial")
             dl.setQueueMode(DownloadManager::Serial);
-        else if (str.startsWith("-"))
+        else if (str.startsWith(QLatin1Char('-')))
             qDebug() << "unsupported option" << str;
         else {
             QUrl url(QUrl::fromUserInput(str));
diff --git a/tests/manual/qnetworkaccessmanager/qget/transferitem.cpp b/tests/manual/qnetworkaccessmanager/qget/transferitem.cpp
index 13fba9f2e5..2e975cdfb2 100644
--- a/tests/manual/qnetworkaccessmanager/qget/transferitem.cpp
+++ b/tests/manual/qnetworkaccessmanager/qget/transferitem.cpp
@@ -42,9 +42,9 @@ TransferItem::TransferItem(const QNetworkRequest &r, const QString &u, const QSt
 void TransferItem::progress(qint64 sent, qint64 total)
 {
     if (total > 0)
-        qDebug() << (sent*100/total) << "%";
+        qDebug() << (sent*100/total) << '%';
     else
-        qDebug() << sent << "B";
+        qDebug() << sent << 'B';
 }
 
 void TransferItem::start()
diff --git a/tests/manual/qscreen/propertyfield.cpp b/tests/manual/qscreen/propertyfield.cpp
index 01f38624d4..a8cf90c9bb 100644
--- a/tests/manual/qscreen/propertyfield.cpp
+++ b/tests/manual/qscreen/propertyfield.cpp
@@ -87,7 +87,7 @@ void PropertyField::propertyChanged()
             m_lastChangeTime = QTime::currentTime().addSecs(-5);
         }
 
-        qDebug() << "  " << QString::fromUtf8(m_prop.name()) << ":" << val;
+        qDebug() << "  " << QString::fromUtf8(m_prop.name()) << ':' << val;
         // If the value has recently changed, show the change
         if (text != m_lastText || m_lastChangeTime.elapsed() < 1000) {
             setText(m_lastTextShowing + " -> " + text);
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
index 2462bb3701..f868d5a910 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
@@ -201,7 +201,7 @@ QString TabletWidget::buttonsToString(Qt::MouseButtons bs)
         if (bs.testFlag(b))
             ret << buttonToString(b);
     }
-    return ret.join("|");
+    return ret.join(QLatin1Char('|'));
 }
 
 void TabletWidget::tabletEvent(QTabletEvent *event)
diff --git a/tests/manual/unc/main.cpp b/tests/manual/unc/main.cpp
index d507bb2ba4..b5893eda20 100644
--- a/tests/manual/unc/main.cpp
+++ b/tests/manual/unc/main.cpp
@@ -63,7 +63,7 @@ protected:
         label->setTextInteractionFlags(Qt::TextBrowserInteraction);
         label->setOpenExternalLinks(true);
 
-        QString link("<a href=" + path + ">" + path + "</a>");
+        QString link("<a href=" + path + QLatin1Char('>') + path + "</a>");
 
         label->setText(link);
         return label;