diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-11 11:07:32 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-17 07:47:09 +0000 |
| commit | 1dac47c1418b44cf4a56b42bfca2b277795fd213 (patch) | |
| tree | 26727943c30628340662a66d7cbe9f52d75c5b58 /src/qml/memory | |
| parent | d89d5cffe79bd060a1b04a2c47a3d728bffbe195 (diff) | |
Cleanups in Value/Primitive
Get rid of Primitive and move the corresponding methods
directly into Value. Mark many methods in Value as
constexpr and turn Value into a POD type again.
Keep Primitive as a pure alias to Value for source
compatibility of other modules that might be using it.
Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/qv4mm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index acaaa3b920..fb6d9478db 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -975,7 +975,7 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt if (QObjectWrapper *qobjectWrapper = (*it).as<QObjectWrapper>()) qobjectWrapper->destroyObject(lastSweep); - (*it) = Primitive::undefinedValue(); + (*it) = Value::undefinedValue(); } // remove objects from weak maps and sets @@ -1007,7 +1007,7 @@ void MemoryManager::sweep(bool lastSweep, ClassDestroyStatsCallback classCountPt Managed *m = (*it).managed(); if (!m || m->markBit()) continue; - (*it) = Primitive::undefinedValue(); + (*it) = Value::undefinedValue(); } // Now it is time to free QV4::QObjectWrapper Value, we must check the Value's tag to make sure its object has been destroyed |