diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-30 08:43:57 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-30 08:43:57 (GMT) |
| commit | 5d9fd03a7263523f0b2d830a450328b58e50e1bb (patch) | |
| tree | bbd6a7a36830fafb574cda0f3ad9079c5e5a2674 /src/corelib/tools/qbytearray.h | |
| parent | 4b51c3a7c0875d23cda1d377e2f8faaf3c4b2396 (diff) | |
| parent | c01d4f630187602b8c69e7f20c2b3edc4151e226 (diff) | |
| download | Qt-5d9fd03a7263523f0b2d830a450328b58e50e1bb.zip Qt-5d9fd03a7263523f0b2d830a450328b58e50e1bb.tar.gz Qt-5d9fd03a7263523f0b2d830a450328b58e50e1bb.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/tools/qbytearray.h')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 0b77512..a3fe3f5 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -299,6 +299,7 @@ public: QByteArray &setNum(qulonglong, int base = 10); QByteArray &setNum(float, char f = 'g', int prec = 6); QByteArray &setNum(double, char f = 'g', int prec = 6); + QByteArray &setRawData(const char *a, uint n); // ### Qt 5: use an int static QByteArray number(int, int base = 10); static QByteArray number(uint, int base = 10); @@ -343,8 +344,6 @@ public: inline QT3_SUPPORT QByteArray& duplicate(const QByteArray& a) { *this = a; return *this; } inline QT3_SUPPORT QByteArray& duplicate(const char *a, uint n) { *this = QByteArray(a, n); return *this; } - inline QT3_SUPPORT QByteArray& setRawData(const char *a, uint n) - { *this = fromRawData(a, n); return *this; } inline QT3_SUPPORT void resetRawData(const char *, uint) { clear(); } inline QT3_SUPPORT QByteArray lower() const { return toLower(); } inline QT3_SUPPORT QByteArray upper() const { return toUpper(); } |