diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2022-01-14 16:48:17 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-01-16 11:59:39 +0000 |
commit | 3976449c0e38ac4294ea1b353098115be1a5e385 (patch) | |
tree | 443fd9f2150257a906c6847238dd974803396603 /src/corelib/serialization/qtextstream_p.h | |
parent | 3f06d47e5757d7cbc5e21b9cfb2008a9a6510b96 (diff) |
QTextStream: code tidies
Port the internals to qsizetype, and use QStringView instead of QString
as a function parameter.
The padding() function is changed to take a qsizetype to avoid warnings,
but the maximum padding that can be specified is still limited by the
range of an int (this is guarded via an assert).
Change-Id: I9dd98e5a534990a1758b080900a12dc793528d19
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/serialization/qtextstream_p.h')
-rw-r--r-- | src/corelib/serialization/qtextstream_p.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/corelib/serialization/qtextstream_p.h b/src/corelib/serialization/qtextstream_p.h index 79643de35d..4a9f54ce1d 100644 --- a/src/corelib/serialization/qtextstream_p.h +++ b/src/corelib/serialization/qtextstream_p.h @@ -174,13 +174,16 @@ public: NumberParsingStatus getNumber(qulonglong *l); bool getReal(double *f); - inline void write(const QString &data) { write(data.begin(), data.length()); } + inline void write(QStringView data) { write(data.begin(), data.length()); } inline void write(QChar ch); - void write(const QChar *data, int len); + void write(const QChar *data, qsizetype len); void write(QLatin1String data); - void writePadding(int len); - inline void putString(const QString &ch, bool number = false) { putString(ch.constData(), ch.length(), number); } - void putString(const QChar *data, int len, bool number = false); + void writePadding(qsizetype len); + inline void putString(QStringView string, bool number = false) + { + putString(string.constData(), string.length(), number); + } + void putString(const QChar *data, qsizetype len, bool number = false); void putString(QLatin1String data, bool number = false); void putString(QUtf8StringView data, bool number = false); inline void putChar(QChar ch); @@ -189,7 +192,7 @@ public: struct PaddingResult { int left, right; }; - PaddingResult padding(int len) const; + PaddingResult padding(qsizetype len) const; // buffers bool fillReadBuffer(qint64 maxBytes = -1); |