diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index 573a36d9a04..1219b3d86db 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -4561,6 +4561,10 @@ QByteArray QByteArray::fromPercentEncoding(const QByteArray &input, char percent \sa toStdString(), QString::fromStdString() */ +QByteArray QByteArray::fromStdString(const std::string &s) +{ + return QByteArray(s.data(), qsizetype(s.size())); +} /*! \fn std::string QByteArray::toStdString() const @@ -4574,6 +4578,10 @@ QByteArray QByteArray::fromPercentEncoding(const QByteArray &input, char percent \sa fromStdString(), QString::toStdString() */ +std::string QByteArray::toStdString() const +{ + return std::string(data(), size_t(size())); +} /*! \since 4.4 diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index 4ee6c34baa0..a43a1a41280 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -430,8 +430,8 @@ public: void shrink_to_fit() { squeeze(); } iterator erase(const_iterator first, const_iterator last); - static inline QByteArray fromStdString(const std::string &s); - inline std::string toStdString() const; + static QByteArray fromStdString(const std::string &s); + std::string toStdString() const; inline qsizetype size() const noexcept { return d->size; } #if QT_DEPRECATED_SINCE(6, 4) @@ -567,12 +567,6 @@ inline QByteArray &QByteArray::setNum(ulong n, int base) inline QByteArray &QByteArray::setNum(float n, char format, int precision) { return setNum(double(n), format, precision); } -inline std::string QByteArray::toStdString() const -{ return std::string(constData(), length()); } - -inline QByteArray QByteArray::fromStdString(const std::string &s) -{ return QByteArray(s.data(), qsizetype(s.size())); } - #if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QByteArray &); Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QByteArray &);