Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6507 from jonaski/sprintf

Browse Source 
Replace use of QString::sprintf with QString::asprintf
This commit is contained in:
John Maguire 2020-01-05 00:40:43 +00:00 committed by GitHub
commit 7d2c622d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/utilities.cpp
View File

@ -98,10 +98,11 @@ QString PrettyTime(int seconds, bool always_show_hours) {
QString ret; QString ret;
if (hours || always_show_hours) if (hours || always_show_hours)
ret.sprintf("%d:%02d:%02d", hours, minutes, ret = QString::asprintf("%d:%02d:%02d", hours, minutes,
seconds); // NOLINT(runtime/printf) seconds); // NOLINT(runtime/printf)
else else
ret.sprintf("%d:%02d", minutes, seconds); // NOLINT(runtime/printf) ret = QString::asprintf("%d:%02d", minutes,
seconds); // NOLINT(runtime/printf)
return ret; return ret;
} }
@ -165,15 +166,18 @@ QString PrettySize(quint64 bytes) {
if (bytes <= 1000) if (bytes <= 1000)
ret = QString::number(bytes) + " bytes"; ret = QString::number(bytes) + " bytes";
else if (bytes <= 1000 * 1000) else if (bytes <= 1000 * 1000)
ret.sprintf("%.1f KB", ret = QString::asprintf(
static_cast<float>(bytes) / 1000); // NOLINT(runtime/printf) "%.1f KB",
static_cast<float>(bytes) / 1000); // NOLINT(runtime/printf)
else if (bytes <= 1000 * 1000 * 1000) else if (bytes <= 1000 * 1000 * 1000)
ret.sprintf("%.1f MB", static_cast<float>(bytes) / ret = QString::asprintf(
(1000 * 1000)); // NOLINT(runtime/printf) "%.1f MB",
static_cast<float>(bytes) / (1000 * 1000)); // NOLINT(runtime/printf)
else else
ret.sprintf("%.1f GB", ret = QString::asprintf(
static_cast<float>(bytes) / "%.1f GB",
(1000 * 1000 * 1000)); // NOLINT(runtime/printf) static_cast<float>(bytes) /
(1000 * 1000 * 1000)); // NOLINT(runtime/printf)
} }
return ret; return ret;
} }

2
src/devices/macdevicelister.mm
View File

@ -700,7 +700,7 @@ QList<QUrl> MacDeviceLister::MakeDeviceUrls(const QString& serial) {
if (IsMTPSerial(serial)) { if (IsMTPSerial(serial)) {
const MTPDevice& device = mtp_devices_[serial]; const MTPDevice& device = mtp_devices_[serial];
QString str; 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; QUrlQuery url_query;
url_query.addQueryItem("vendor", device.vendor); url_query.addQueryItem("vendor", device.vendor);
url_query.addQueryItem("vendor_id", QString::number(device.vendor_id)); url_query.addQueryItem("vendor_id", QString::number(device.vendor_id));

2
src/ui/playbacksettingspage.cpp
View File

@ -159,7 +159,7 @@ void PlaybackSettingsPage::Save() {
void PlaybackSettingsPage::RgPreampChanged(int value) { void PlaybackSettingsPage::RgPreampChanged(int value) {
float db = float(value) / 10 - 15; float db = float(value) / 10 - 15;
QString db_str; QString db_str;
db_str.sprintf("%+.1f dB", db); db_str = QString::asprintf("%+.1f dB", db);
ui_->replaygain_preamp_label->setText(db_str); ui_->replaygain_preamp_label->setText(db_str);
} }

6
src/widgets/stylehelper.cpp
View File

@ -137,9 +137,9 @@ void StyleHelper::verticalGradient(QPainter* painter, const QRect& spanRect,
if (StyleHelper::usePixmapCache()) { if (StyleHelper::usePixmapCache()) {
QString key; QString key;
QColor keyColor = baseColor(lightColored); 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(), spanRect.height(), clipRect.width(),
keyColor.rgb()); clipRect.height(), keyColor.rgb());
; ;
QPixmap pixmap; QPixmap pixmap;