From 13fdbfc5e80e2b32fe142676bc76f26ec279f54b Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 21 Dec 2019 21:56:48 +0100
Subject: [PATCH] Use QString::asprintf

---
 src/core/utilities.cpp                 | 10 +++++-----
 src/device/imobiledeviceconnection.cpp |  4 ++--
 src/device/macosdevicelister.mm        |  2 +-
 src/settings/backendsettingspage.cpp   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 8af3481da..1a837b7b2 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -119,8 +119,8 @@ QString PrettyTime(int seconds) {
   seconds %= 60;
 
   QString ret;
-  if (hours) ret = QString("%d:%02d:%02d").arg(hours).arg(minutes).arg(seconds);
-  else ret = QString("%d:%02d").arg(minutes).arg(seconds);
+  if (hours) ret = QString::asprintf("%d:%02d:%02d", hours, minutes, seconds);
+  else ret = QString::asprintf("%d:%02d", minutes, seconds);
 
   return ret;
 
@@ -186,11 +186,11 @@ QString PrettySize(quint64 bytes) {
     if (bytes <= 1000)
       ret = QString::number(bytes) + " bytes";
     else if (bytes <= 1000 * 1000)
-      ret = QString("%.1f KB").arg(float(bytes) / 1000);
+      ret = QString::asprintf("%.1f KB", float(bytes) / 1000);
     else if (bytes <= 1000 * 1000 * 1000)
-      ret = QString("%.1f MB").arg(float(bytes) / (1000 * 1000));
+      ret = QString::asprintf("%.1f MB", float(bytes) / (1000 * 1000));
     else
-      ret = QString("%.1f GB").arg(float(bytes) / (1000 * 1000 * 1000));
+      ret = QString::asprintf("%.1f GB", float(bytes) / (1000 * 1000 * 1000));
   }
   return ret;
 
diff --git a/src/device/imobiledeviceconnection.cpp b/src/device/imobiledeviceconnection.cpp
index 2c481598a..2696b9b7a 100644
--- a/src/device/imobiledeviceconnection.cpp
+++ b/src/device/imobiledeviceconnection.cpp
@@ -233,7 +233,7 @@ QString iMobileDeviceConnection::GetUnusedFilename(Itdb_iTunesDB *itdb, const So
 
   // Pick one at random
   const int dir_num = qrand() % total_musicdirs;
-  QString dir = QString("/iTunes_Control/Music/F%02d").arg(dir_num);
+  QString dir = QString::asprintf("/iTunes_Control/Music/F%02d", dir_num);
 
   if (!Exists(dir)) {
     qLog(Warning) << "Music directory doesn't exist:" << dir;
@@ -250,7 +250,7 @@ QString iMobileDeviceConnection::GetUnusedFilename(Itdb_iTunesDB *itdb, const So
   static const int kRandMax = 999999;
   QString filename;
   forever {
-    filename = QString("libgpod%06d").arg(qrand() % kRandMax);
+    filename = QString::asprintf("libgpod%06d", qrand() % kRandMax);
     filename += "." + extension;
 
     if (!Exists(dir + "/" + filename))
diff --git a/src/device/macosdevicelister.mm b/src/device/macosdevicelister.mm
index df2e93f04..fa78ec7e7 100644
--- a/src/device/macosdevicelister.mm
+++ b/src/device/macosdevicelister.mm
@@ -713,7 +713,7 @@ QList<QUrl> MacOsDeviceLister::MakeDeviceUrls(const QString& serial) {
 
   if (IsMTPSerial(serial)) {
     const MTPDevice& device = mtp_devices_[serial];
-    QString str = QString("gphoto2://usb-%d-%d/").arg(device.bus).arg(device.address);
+    QString str = QString::asprintf("gphoto2://usb-%d-%d/", device.bus, device.address);
     QUrlQuery url_query;
     url_query.addQueryItem("vendor", device.vendor);
     url_query.addQueryItem("vendor_id", QString::number(device.vendor_id));
diff --git a/src/settings/backendsettingspage.cpp b/src/settings/backendsettingspage.cpp
index 5bd860bd2..60b3be3cd 100644
--- a/src/settings/backendsettingspage.cpp
+++ b/src/settings/backendsettingspage.cpp
@@ -526,7 +526,7 @@ void BackendSettingsPage::DeviceStringChanged() {
 void BackendSettingsPage::RgPreampChanged(int value) {
 
   float db = float(value) / 10 - 15;
-  QString db_str = QString("%+.1f dB").arg(db);
+  QString db_str = QString::asprintf("%+.1f dB", db);
   ui_->label_replaygainpreamp->setText(db_str);
 
 }