diff options
3 files changed, 27 insertions, 24 deletions
diff --git a/src/corelib/serialization/qcborstreamreader.cpp b/src/corelib/serialization/qcborstreamreader.cpp index e4e0cfa6c7..798a2d84d9 100644 --- a/src/corelib/serialization/qcborstreamreader.cpp +++ b/src/corelib/serialization/qcborstreamreader.cpp @@ -1461,7 +1461,7 @@ bool QCborStreamReaderPrivate::readFullString(ReadStringChunk params) \sa readString(), readStringChunk(), isString(), toByteArray() */ /*! - \fn QCborStreamReader::appendToString(QString &dst) + \fn QCborStreamReader::readAndAppendToString(QString &dst) \since 6.7 Decodes the current text string and appends to \a dst. If the string is @@ -1474,9 +1474,9 @@ bool QCborStreamReaderPrivate::readFullString(ReadStringChunk params) \include qcborstreamreader.cpp note-not-restartable - \sa readString(), readStringChunk(), isString(), appendToByteArray() + \sa readString(), readStringChunk(), isString(), readAndAppendToByteArray() */ -bool QCborStreamReader::_appendToString_helper(QString &dst) +bool QCborStreamReader::_readAndAppendToString_helper(QString &dst) { bool ok = d->readFullString(&dst); if (ok) @@ -1501,7 +1501,7 @@ bool QCborStreamReader::_appendToString_helper(QString &dst) \sa readString(), readStringChunk(), isString(), toByteArray() */ /*! - \fn QCborStreamReader::appendToUtf8String(QByteArray &dst) + \fn QCborStreamReader::readAndAppendToUtf8String(QByteArray &dst) \since 6.7 Decodes the current text string and appends to \a dst. If the string is @@ -1514,9 +1514,9 @@ bool QCborStreamReader::_appendToString_helper(QString &dst) \include qcborstreamreader.cpp note-not-restartable - \sa readString(), readStringChunk(), isString(), appendToByteArray() + \sa readString(), readStringChunk(), isString(), readAndAppendToByteArray() */ -bool QCborStreamReader::_appendToUtf8String_helper(QByteArray &dst) +bool QCborStreamReader::_readAndAppendToUtf8String_helper(QByteArray &dst) { using P = QCborStreamReaderPrivate::ReadStringChunk; bool ok = d->readFullString({ &dst, P::Utf8String }); @@ -1543,7 +1543,7 @@ bool QCborStreamReader::_appendToUtf8String_helper(QByteArray &dst) */ /*! - \fn QCborStreamReader::appendToByteArray(QByteArray &dst) + \fn QCborStreamReader::readAndAppendToByteArray(QByteArray &dst) \since 6.7 Decodes the current byte string and appends to \a dst. If the string is @@ -1556,9 +1556,9 @@ bool QCborStreamReader::_appendToUtf8String_helper(QByteArray &dst) \include qcborstreamreader.cpp note-not-restartable - \sa readByteArray(), readStringChunk(), isByteArray(), appendToString() + \sa readByteArray(), readStringChunk(), isByteArray(), readAndAppendToString() */ -bool QCborStreamReader::_appendToByteArray_helper(QByteArray &dst) +bool QCborStreamReader::_readAndAppendToByteArray_helper(QByteArray &dst) { bool ok = d->readFullString(&dst); if (ok) diff --git a/src/corelib/serialization/qcborstreamreader.h b/src/corelib/serialization/qcborstreamreader.h index f2bd2a614b..52803fd841 100644 --- a/src/corelib/serialization/qcborstreamreader.h +++ b/src/corelib/serialization/qcborstreamreader.h @@ -120,9 +120,12 @@ public: bool enterContainer() { Q_ASSERT(isContainer()); return _enterContainer_helper(); } bool leaveContainer(); - bool appendToString(QString &dst) { Q_ASSERT(isString()); return _appendToString_helper(dst); } - bool appendToUtf8String(QByteArray &dst){ Q_ASSERT(isString()); return _appendToUtf8String_helper(dst); } - bool appendToByteArray(QByteArray &dst) { Q_ASSERT(isByteArray()); return _appendToByteArray_helper(dst); } + bool readAndAppendToString(QString &dst) + { Q_ASSERT(isString()); return _readAndAppendToString_helper(dst); } + bool readAndAppendToUtf8String(QByteArray &dst) + { Q_ASSERT(isString()); return _readAndAppendToUtf8String_helper(dst); } + bool readAndAppendToByteArray(QByteArray &dst) + { Q_ASSERT(isByteArray()); return _readAndAppendToByteArray_helper(dst); } StringResult<QString> readString() { Q_ASSERT(isString()); return _readString_helper(); } StringResult<QByteArray> readUtf8String() { Q_ASSERT(isString()); return _readUtf8String_helper(); } StringResult<QByteArray> readByteArray(){ Q_ASSERT(isByteArray()); return _readByteArray_helper(); } @@ -149,21 +152,21 @@ public: QString toString() { QString dst; - if (!appendToString(dst)) + if (!readAndAppendToString(dst)) dst = QString{}; return dst; } QByteArray toUtf8String() { QByteArray dst; - if (!appendToUtf8String(dst)) + if (!readAndAppendToUtf8String(dst)) dst = QByteArray{}; return dst; } QByteArray toByteArray() { QByteArray dst; - if (!appendToByteArray(dst)) + if (!readAndAppendToByteArray(dst)) dst = QByteArray{}; return dst; } @@ -175,9 +178,9 @@ private: StringResult<QByteArray> _readUtf8String_helper(); StringResult<QByteArray> _readByteArray_helper(); qsizetype _currentStringChunkSize() const; - bool _appendToString_helper(QString &); - bool _appendToUtf8String_helper(QByteArray &); - bool _appendToByteArray_helper(QByteArray &); + bool _readAndAppendToString_helper(QString &); + bool _readAndAppendToUtf8String_helper(QByteArray &); + bool _readAndAppendToByteArray_helper(QByteArray &); template <typename FP> FP _toFloatingPoint() const noexcept { diff --git a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp index 9ba91f3f9c..0dac7f7550 100644 --- a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp +++ b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp @@ -697,12 +697,12 @@ void tst_QCborStreamReader::strings() if (reader.isByteArray()) { QByteArray prefix("some prefix"); QByteArray ba = prefix; - QVERIFY(reader.appendToByteArray(ba)); + QVERIFY(reader.readAndAppendToByteArray(ba)); QCOMPARE(ba, prefix + fullString); } else { QString prefix("some prefix"); QString str = prefix; - QVERIFY(reader.appendToString(str)); + QVERIFY(reader.readAndAppendToString(str)); QCOMPARE(str, prefix + QString::fromUtf8(fullString)); } @@ -712,7 +712,7 @@ void tst_QCborStreamReader::strings() if (reader.isString()) { QByteArray prefix("some prefix"); QByteArray utf8 = prefix; - QVERIFY(reader.appendToUtf8String(utf8)); + QVERIFY(reader.readAndAppendToUtf8String(utf8)); QCOMPARE(utf8, prefix + fullString); reader.reset(); @@ -952,12 +952,12 @@ void tst_QCborStreamReader::validation() if (reader.isString()) { QString prefix = "some prefix"; QString str = prefix; - QVERIFY(!reader.appendToString(str)); + QVERIFY(!reader.readAndAppendToString(str)); QVERIFY(str.startsWith(prefix)); // but may have decoded some } else if (reader.isByteArray()) { QByteArray prefix = "some prefix"; QByteArray ba = prefix; - QVERIFY(!reader.appendToByteArray(ba)); + QVERIFY(!reader.readAndAppendToByteArray(ba)); QVERIFY(ba.startsWith(prefix)); // but may have decoded some } QCOMPARE(reader.lastError(), error); @@ -975,7 +975,7 @@ void tst_QCborStreamReader::validation() if (reader.isString()) { QByteArray prefix = "some prefix"; QByteArray ba = prefix; - QVERIFY(!reader.appendToUtf8String(ba)); + QVERIFY(!reader.readAndAppendToUtf8String(ba)); QVERIFY(ba.startsWith(prefix)); // but may have decoded some QCOMPARE(reader.lastError(), error); |