diff options
Diffstat (limited to 'src/corelib/json/qjson_p.h')
| -rw-r--r-- | src/corelib/json/qjson_p.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/corelib/json/qjson_p.h b/src/corelib/json/qjson_p.h index 0742ced39b..f8f41c2e25 100644 --- a/src/corelib/json/qjson_p.h +++ b/src/corelib/json/qjson_p.h @@ -620,15 +620,24 @@ public: bool operator ==(const QString &key) const; inline bool operator !=(const QString &key) const { return !operator ==(key); } - bool operator >=(const QString &key) const; + inline bool operator >=(const QString &key) const; bool operator ==(const Entry &other) const; bool operator >=(const Entry &other) const; }; +inline bool Entry::operator >=(const QString &key) const +{ + if (value.latinKey) + return (shallowLatin1Key() >= key); + else + return (shallowKey() >= key); +} + inline bool operator <(const QString &key, const Entry &e) { return e >= key; } + class Header { public: qle_uint tag; // 'qbjs' @@ -735,7 +744,15 @@ public: Data *clone(Base *b, int reserve = 0) { - int size = sizeof(Header) + b->size + reserve; + int size = sizeof(Header) + b->size; + if (ref.load() == 1 && alloc >= size + reserve) + return this; + + if (reserve) { + if (reserve < 128) + reserve = 128; + size = qMax(size + reserve, size *2); + } char *raw = (char *)malloc(size); Q_CHECK_PTR(raw); memcpy(raw + sizeof(Header), b, b->size); |