dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QString::asprintf

Browse Source
This commit is contained in:
Jonas Kvinge
2019-12-21 21:56:48 +01:00
parent 882c94110e
commit 13fdbfc5e8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/utilities.cpp
View File

@@ -119,8 +119,8 @@ QString PrettyTime(int seconds) {
seconds %= 60; seconds %= 60;
QString ret; QString ret;
if (hours) ret = QString("%d:%02d:%02d").arg(hours).arg(minutes).arg(seconds); if (hours) ret = QString::asprintf("%d:%02d:%02d", hours, minutes, seconds);
else ret = QString("%d:%02d").arg(minutes).arg(seconds); else ret = QString::asprintf("%d:%02d", minutes, seconds);
return ret; return ret;
@@ -186,11 +186,11 @@ 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 = QString("%.1f KB").arg(float(bytes) / 1000); ret = QString::asprintf("%.1f KB", float(bytes) / 1000);
else if (bytes <= 1000 * 1000 * 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 else
ret = QString("%.1f GB").arg(float(bytes) / (1000 * 1000 * 1000)); ret = QString::asprintf("%.1f GB", float(bytes) / (1000 * 1000 * 1000));
} }
return ret; return ret;

4
src/device/imobiledeviceconnection.cpp
View File

@@ -233,7 +233,7 @@ QString iMobileDeviceConnection::GetUnusedFilename(Itdb_iTunesDB *itdb, const So
// Pick one at random // Pick one at random
const int dir_num = qrand() % total_musicdirs; 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)) { if (!Exists(dir)) {
qLog(Warning) << "Music directory doesn't exist:" << 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; static const int kRandMax = 999999;
QString filename; QString filename;
forever { forever {
filename = QString("libgpod%06d").arg(qrand() % kRandMax); filename = QString::asprintf("libgpod%06d", qrand() % kRandMax);
filename += "." + extension; filename += "." + extension;
if (!Exists(dir + "/" + filename)) if (!Exists(dir + "/" + filename))

2
src/device/macosdevicelister.mm
View File

@@ -713,7 +713,7 @@ QList<QUrl> MacOsDeviceLister::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("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; 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/settings/backendsettingspage.cpp
View File

@@ -526,7 +526,7 @@ void BackendSettingsPage::DeviceStringChanged() {
void BackendSettingsPage::RgPreampChanged(int value) { void BackendSettingsPage::RgPreampChanged(int value) {
float db = float(value) / 10 - 15; 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); ui_->label_replaygainpreamp->setText(db_str);
} }