qdbusviewer: Use modern string literals

Replace most uses of QLatin1String by _L1, QStringLiteral by _s.

Use tr() for user-visible strings. Reorganize the loop inside
QDBusViewer::dumpMessage() slightly to make it less sensitive to
translation changes.

Change-Id: Id987bd0efe06d0efd80c57982c3c2a6a031c369a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/qdbus/qdbusviewer/propertydialog.cpp b/src/qdbus/qdbusviewer/propertydialog.cpp
index 6d133d7af..5fbfd94bc 100644
--- a/src/qdbus/qdbusviewer/propertydialog.cpp
+++ b/src/qdbus/qdbusviewer/propertydialog.cpp
@@ -7,6 +7,8 @@
 #include <QLayout>
 #include <QDebug>
 
+using namespace Qt::StringLiterals;
+
 PropertyDialog::PropertyDialog(QWidget *parent, Qt::WindowFlags f)
     : QDialog(parent, f)
 {
@@ -16,7 +18,7 @@ PropertyDialog::PropertyDialog(QWidget *parent, Qt::WindowFlags f)
 
     buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     propertyTable->setColumnCount(2);
-    const QStringList labels = QStringList() << QLatin1String("Name") << QLatin1String("Value");
+    const QStringList labels = QStringList() << tr("Name") << tr("Value");
     propertyTable->setHorizontalHeaderLabels(labels);
     propertyTable->horizontalHeader()->setStretchLastSection(true);
     propertyTable->setEditTriggers(QAbstractItemView::AllEditTriggers);
@@ -42,10 +44,10 @@ void PropertyDialog::addProperty(const QString &aname, int type)
 
     QString name = aname;
     if (name.isEmpty())
-        name = QLatin1String("argument ") + QString::number(rowCount + 1);
-    name += QLatin1String(" (");
+        name = tr("argument %1").arg(rowCount + 1);
+    name += " ("_L1;
     name += QLatin1String(QMetaType(type).name());
-    name += QLatin1String(")");
+    name += ")"_L1;
     QTableWidgetItem *nameItem = new QTableWidgetItem(name);
     nameItem->setFlags(nameItem->flags() &
             ~(Qt::ItemIsEditable | Qt::ItemIsSelectable));