diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-01-23 12:03:36 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-02-12 19:40:04 +0000 |
| commit | 05c38a9111320da311e5993faf12ce8e1f1713e8 (patch) | |
| tree | b1ca051511120d113e891333b8918f8d5a4748ef /src/corelib | |
| parent | abcb5471b75fe9879775ec16f0f12a1e30422789 (diff) | |
QtCore: assorted migrations to QString::asprintf
Change-Id: Ie99d3eeeced89dd8336717954fd5ca7117bb20b4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/tools/qvsnprintf.cpp | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 1b1d9af187..a8a461e868 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -617,12 +617,11 @@ void QHashData::dump() numBuckets); qDebug(" %p (fakeNode = %p)", this, fakeNext); for (int i = 0; i < numBuckets; ++i) { - QString line; Node *n = buckets[i]; if (n != reinterpret_cast<Node *>(this)) { - line.sprintf("%d:", i); + QString line = QString::asprintf("%d:", i); while (n != reinterpret_cast<Node *>(this)) { - line += QString().sprintf(" -> [%p]", n); + line += QString::asprintf(" -> [%p]", n); if (!n) { line += " (CORRUPT)"; break; diff --git a/src/corelib/tools/qvsnprintf.cpp b/src/corelib/tools/qvsnprintf.cpp index e9590c3971..6f18d21d2b 100644 --- a/src/corelib/tools/qvsnprintf.cpp +++ b/src/corelib/tools/qvsnprintf.cpp @@ -69,10 +69,7 @@ int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap) if (!str || !fmt) return -1; - QString buf; - buf.vsprintf(fmt, ap); - - QByteArray ba = buf.toLocal8Bit(); + const QByteArray ba = QString::vasprintf(fmt, ap).toLocal8Bit(); if (n > 0) { size_t blen = qMin(size_t(ba.length()), size_t(n - 1)); |