qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor const cleanup 

The unit data of QV4::CompiledData::CompilationUnit is read-only, which we
should "enforce" with a const, especially as in the future it may come from a
read-only mmap'ed chunk of memory.

Change-Id: I58dde9fe2494d3cfa52cdc9f612c7fa90b98aa26
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Simon Hausmann 2016-06-03 11:23:25 +02:00
parent 23ec4ac8ba
commit 4018a91d2f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/compiler/qv4compileddata.cpp
View File

@ -82,7 +82,7 @@ CompilationUnit::~CompilationUnit()
{ {
unlink(); unlink();
if (data && !(data->flags & QV4::CompiledData::Unit::StaticData)) if (data && !(data->flags & QV4::CompiledData::Unit::StaticData))
free(data); free(const_cast<Unit *>(data));
data = 0; data = 0;
} }

2
src/qml/compiler/qv4compileddata_p.h
View File

@ -656,7 +656,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public QQmlRefCount
virtual ~CompilationUnit(); virtual ~CompilationUnit();
#endif #endif
Unit *data; const Unit *data;
// Called only when building QML, when we build the header for JS first and append QML data // Called only when building QML, when we build the header for JS first and append QML data
virtual QV4::CompiledData::Unit *createUnitData(QmlIR::Document *irDocument); virtual QV4::CompiledData::Unit *createUnitData(QmlIR::Document *irDocument);

2
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
View File

@ -2074,7 +2074,7 @@ void tst_qqmllanguage::scriptStringWithoutSourceCode()
QQmlTypeData *td = eng->typeLoader.getType(url); QQmlTypeData *td = eng->typeLoader.getType(url);
Q_ASSERT(td); Q_ASSERT(td);
QV4::CompiledData::Unit *qmlUnit = td->compilationUnit()->data; const QV4::CompiledData::Unit *qmlUnit = td->compilationUnit()->data;
Q_ASSERT(qmlUnit); Q_ASSERT(qmlUnit);
const QV4::CompiledData::Object *rootObject = qmlUnit->objectAt(qmlUnit->indexOfRootObject); const QV4::CompiledData::Object *rootObject = qmlUnit->objectAt(qmlUnit->indexOfRootObject);
QCOMPARE(qmlUnit->stringAt(rootObject->inheritedTypeNameIndex), QString("MyTypeObject")); QCOMPARE(qmlUnit->stringAt(rootObject->inheritedTypeNameIndex), QString("MyTypeObject"));