From f81a3aa8d84c0262ed952fbd905a6f241b29aa05 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 5 Jan 2020 00:12:32 +0100 Subject: [PATCH 1/2] Replace use of QString::sprintf with QString::asprintf --- src/core/utilities.cpp | 10 +++++----- src/devices/macdevicelister.mm | 2 +- src/ui/playbacksettingspage.cpp | 2 +- src/widgets/stylehelper.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index 89ceca0b6..3c5cba9e2 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -98,10 +98,10 @@ QString PrettyTime(int seconds, bool always_show_hours) { QString ret; if (hours || always_show_hours) - ret.sprintf("%d:%02d:%02d", hours, minutes, + ret = QString::asprintf("%d:%02d:%02d", hours, minutes, seconds); // NOLINT(runtime/printf) else - ret.sprintf("%d:%02d", minutes, seconds); // NOLINT(runtime/printf) + ret = QString::asprintf("%d:%02d", minutes, seconds); // NOLINT(runtime/printf) return ret; } @@ -165,13 +165,13 @@ QString PrettySize(quint64 bytes) { if (bytes <= 1000) ret = QString::number(bytes) + " bytes"; else if (bytes <= 1000 * 1000) - ret.sprintf("%.1f KB", + ret = QString::asprintf("%.1f KB", static_cast(bytes) / 1000); // NOLINT(runtime/printf) else if (bytes <= 1000 * 1000 * 1000) - ret.sprintf("%.1f MB", static_cast(bytes) / + ret = QString::asprintf("%.1f MB", static_cast(bytes) / (1000 * 1000)); // NOLINT(runtime/printf) else - ret.sprintf("%.1f GB", + ret = QString::asprintf("%.1f GB", static_cast(bytes) / (1000 * 1000 * 1000)); // NOLINT(runtime/printf) } diff --git a/src/devices/macdevicelister.mm b/src/devices/macdevicelister.mm index 2ac240776..baf863bc0 100644 --- a/src/devices/macdevicelister.mm +++ b/src/devices/macdevicelister.mm @@ -700,7 +700,7 @@ QList MacDeviceLister::MakeDeviceUrls(const QString& serial) { if (IsMTPSerial(serial)) { const MTPDevice& device = mtp_devices_[serial]; QString str; - str.sprintf("gphoto2://usb-%d-%d/", device.bus, device.address); + 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/ui/playbacksettingspage.cpp b/src/ui/playbacksettingspage.cpp index e20e8e199..621580e56 100644 --- a/src/ui/playbacksettingspage.cpp +++ b/src/ui/playbacksettingspage.cpp @@ -159,7 +159,7 @@ void PlaybackSettingsPage::Save() { void PlaybackSettingsPage::RgPreampChanged(int value) { float db = float(value) / 10 - 15; QString db_str; - db_str.sprintf("%+.1f dB", db); + db_str = QString::asprintf("%+.1f dB", db); ui_->replaygain_preamp_label->setText(db_str); } diff --git a/src/widgets/stylehelper.cpp b/src/widgets/stylehelper.cpp index 87674af37..215ba6a9a 100644 --- a/src/widgets/stylehelper.cpp +++ b/src/widgets/stylehelper.cpp @@ -137,7 +137,7 @@ void StyleHelper::verticalGradient(QPainter* painter, const QRect& spanRect, if (StyleHelper::usePixmapCache()) { QString key; QColor keyColor = baseColor(lightColored); - key.sprintf("mh_vertical %d %d %d %d %d", spanRect.width(), + key = QString::asprintf("mh_vertical %d %d %d %d %d", spanRect.width(), spanRect.height(), clipRect.width(), clipRect.height(), keyColor.rgb()); ; From 7f6e7f8b3044454c248d0248e82c60980b66c1f1 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 5 Jan 2020 00:17:18 +0100 Subject: [PATCH 2/2] Fix formatting --- src/core/utilities.cpp | 22 +++++++++++++--------- src/widgets/stylehelper.cpp | 4 ++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index 3c5cba9e2..84cc2cd4d 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -99,9 +99,10 @@ QString PrettyTime(int seconds, bool always_show_hours) { QString ret; if (hours || always_show_hours) ret = QString::asprintf("%d:%02d:%02d", hours, minutes, - seconds); // NOLINT(runtime/printf) + seconds); // NOLINT(runtime/printf) else - ret = QString::asprintf("%d:%02d", minutes, seconds); // NOLINT(runtime/printf) + ret = QString::asprintf("%d:%02d", minutes, + seconds); // NOLINT(runtime/printf) return ret; } @@ -165,15 +166,18 @@ QString PrettySize(quint64 bytes) { if (bytes <= 1000) ret = QString::number(bytes) + " bytes"; else if (bytes <= 1000 * 1000) - ret = QString::asprintf("%.1f KB", - static_cast(bytes) / 1000); // NOLINT(runtime/printf) + ret = QString::asprintf( + "%.1f KB", + static_cast(bytes) / 1000); // NOLINT(runtime/printf) else if (bytes <= 1000 * 1000 * 1000) - ret = QString::asprintf("%.1f MB", static_cast(bytes) / - (1000 * 1000)); // NOLINT(runtime/printf) + ret = QString::asprintf( + "%.1f MB", + static_cast(bytes) / (1000 * 1000)); // NOLINT(runtime/printf) else - ret = QString::asprintf("%.1f GB", - static_cast(bytes) / - (1000 * 1000 * 1000)); // NOLINT(runtime/printf) + ret = QString::asprintf( + "%.1f GB", + static_cast(bytes) / + (1000 * 1000 * 1000)); // NOLINT(runtime/printf) } return ret; } diff --git a/src/widgets/stylehelper.cpp b/src/widgets/stylehelper.cpp index 215ba6a9a..c2fa8fe60 100644 --- a/src/widgets/stylehelper.cpp +++ b/src/widgets/stylehelper.cpp @@ -138,8 +138,8 @@ void StyleHelper::verticalGradient(QPainter* painter, const QRect& spanRect, QString key; QColor keyColor = baseColor(lightColored); key = QString::asprintf("mh_vertical %d %d %d %d %d", spanRect.width(), - spanRect.height(), clipRect.width(), clipRect.height(), - keyColor.rgb()); + spanRect.height(), clipRect.width(), + clipRect.height(), keyColor.rgb()); ; QPixmap pixmap;