diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-06-19 11:01:33 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-25 16:51:53 +0200 |
| commit | a1fc11ca655850a47701f3715f1408c336ddb6c7 (patch) | |
| tree | 39f897d1674a11368ef98a840edea178be48ee4e /src/corelib/tools/qstring.h | |
| parent | 273ed8e0fa527f4c4382d45eaced54314318173f (diff) | |
Introduce std::string conversion to QByteArray
Add conversion methods similar to those in QString to QByteArray. This
is often more useful than the QString version since std::string like
QByteArray are byte arrays.
[ChangeLog][QtCore][QByteArray] Added convenience methods to convert
directly to and from std::string.
Change-Id: I92c29d4bb1d9e06a667dd9cdd936970e2d272006
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 3985bc76fe..9f36c8bcf9 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1222,7 +1222,7 @@ inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteA #endif // QT_USE_QSTRINGBUILDER inline std::string QString::toStdString() const -{ const QByteArray asc = toUtf8(); return std::string(asc.constData(), asc.length()); } +{ return toUtf8().toStdString(); } inline QString QString::fromStdString(const std::string &s) { return fromUtf8(s.data(), int(s.size())); } |