diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-01-23 11:29:55 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-02-12 19:40:09 +0000 |
commit | f2e3fdc803b9842b6ba4aefe7becdd42eafc4d38 (patch) | |
tree | 02d3c5e43602c6c3c729614fe3655ec9a8b5b8c1 /examples/network | |
parent | 05c38a9111320da311e5993faf12ce8e1f1713e8 (diff) | |
download | qtbase-f2e3fdc803b9842b6ba4aefe7becdd42eafc4d38.tar.gz |
examples: migrate to QString::asprintf
Not that many, if any, uses of sprintf here were idiomatic Qt,
but that's for another commit.
Change-Id: Ic34470d9799942f786770ba9541b29c34d67c6f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'examples/network')
-rw-r--r-- | examples/network/torrent/addtorrentdialog.cpp | 10 | ||||
-rw-r--r-- | examples/network/torrent/connectionmanager.cpp | 4 | ||||
-rw-r--r-- | examples/network/torrent/mainwindow.cpp | 12 |
3 files changed, 10 insertions, 16 deletions
diff --git a/examples/network/torrent/addtorrentdialog.cpp b/examples/network/torrent/addtorrentdialog.cpp index 4c63d3293e..a0d21598c3 100644 --- a/examples/network/torrent/addtorrentdialog.cpp +++ b/examples/network/torrent/addtorrentdialog.cpp @@ -48,16 +48,14 @@ static QString stringNumber(qint64 number) { - QString tmp; if (number > (1024 * 1024 * 1024)) - tmp.sprintf("%.2fGB", number / (1024.0 * 1024.0 * 1024.0)); + return QString::asprintf("%.2fGB", number / (1024.0 * 1024.0 * 1024.0)); else if (number > (1024 * 1024)) - tmp.sprintf("%.2fMB", number / (1024.0 * 1024.0)); + return QString::asprintf("%.2fMB", number / (1024.0 * 1024.0)); else if (number > (1024)) - tmp.sprintf("%.2fKB", number / (1024.0)); + return QString::asprintf("%.2fKB", number / (1024.0)); else - tmp.sprintf("%d bytes", int(number)); - return tmp; + return QString::asprintf("%d bytes", int(number)); } AddTorrentDialog::AddTorrentDialog(QWidget *parent) diff --git a/examples/network/torrent/connectionmanager.cpp b/examples/network/torrent/connectionmanager.cpp index b21ed79394..134eb7eca2 100644 --- a/examples/network/torrent/connectionmanager.cpp +++ b/examples/network/torrent/connectionmanager.cpp @@ -78,9 +78,7 @@ QByteArray ConnectionManager::clientId() const // Generate peer id int startupTime = int(QDateTime::currentDateTime().toTime_t()); - QString s; - s.sprintf("-QT%04x-", (QT_VERSION % 0xffff00) >> 8); - id += s.toLatin1(); + id += QString::asprintf("-QT%04x-", (QT_VERSION % 0xffff00) >> 8).toLatin1(); id += QByteArray::number(startupTime, 10); id += QByteArray(20 - id.size(), '-'); } diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp index 0b493fb42b..653882cfb8 100644 --- a/examples/network/torrent/mainwindow.cpp +++ b/examples/network/torrent/mainwindow.cpp @@ -92,7 +92,7 @@ public: // Set the progress and text values of the style option. int progress = qobject_cast<MainWindow *>(parent())->clientForRow(index.row())->progress(); progressBarOption.progress = progress < 0 ? 0 : progress; - progressBarOption.text = QString().sprintf("%d%%", progressBarOption.progress); + progressBarOption.text = QString::asprintf("%d%%", progressBarOption.progress); // Draw the progress bar onto the view. QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter); @@ -509,8 +509,7 @@ void MainWindow::updateDownloadRate(int bytesPerSecond) // Update the download rate. TorrentClient *client = qobject_cast<TorrentClient *>(sender()); int row = rowOfClient(client); - QString num; - num.sprintf("%.1f KB/s", bytesPerSecond / 1024.0); + const QString num = QString::asprintf("%.1f KB/s", bytesPerSecond / 1024.0); torrentView->topLevelItem(row)->setText(3, num); if (!saveChanges) { @@ -524,8 +523,7 @@ void MainWindow::updateUploadRate(int bytesPerSecond) // Update the upload rate. TorrentClient *client = qobject_cast<TorrentClient *>(sender()); int row = rowOfClient(client); - QString num; - num.sprintf("%.1f KB/s", bytesPerSecond / 1024.0); + const QString num = QString::asprintf("%.1f KB/s", bytesPerSecond / 1024.0); torrentView->topLevelItem(row)->setText(4, num); if (!saveChanges) { @@ -593,14 +591,14 @@ static int rateFromValue(int value) void MainWindow::setUploadLimit(int value) { int rate = rateFromValue(value); - uploadLimitLabel->setText(tr("%1 KB/s").arg(QString().sprintf("%4d", rate))); + uploadLimitLabel->setText(tr("%1 KB/s").arg(QString::asprintf("%4d", rate))); RateController::instance()->setUploadLimit(rate * 1024); } void MainWindow::setDownloadLimit(int value) { int rate = rateFromValue(value); - downloadLimitLabel->setText(tr("%1 KB/s").arg(QString().sprintf("%4d", rate))); + downloadLimitLabel->setText(tr("%1 KB/s").arg(QString::asprintf("%4d", rate))); RateController::instance()->setDownloadLimit(rate * 1024); } |